shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

rk3288:pmic:rk808&syr82x:modify lock error

Browse Source
This commit is contained in:
张晴
2014-05-09 10:06:40 +08:00
parent db92613987
commit 6e7bc37e9c
2 changed files with 31 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/mfd/rk808.c
View File

@@ -809,9 +809,10 @@ int rk808_reg_read(struct rk808 *rk808, u8 reg)
ret = rk808_i2c_read(rk808, reg, 1, &val);
DBG("reg read 0x%02x -> 0x%02x\n", (int)reg, (unsigned)val&0xff);
if (ret < 0)
return ret;
if (ret < 0){
mutex_unlock(&rk808->io_lock);
return ret;
}
mutex_unlock(&rk808->io_lock);
return val & 0xff;
@@ -842,17 +843,22 @@ EXPORT_SYMBOL_GPL(rk808_reg_write);
ret = rk808_i2c_read(rk808, reg, 1, &tmp);
DBG("1 reg read 0x%02x -> 0x%02x\n", (int)reg, (unsigned)tmp&0xff);
if (ret < 0)
return ret;
if (ret < 0){
mutex_unlock(&rk808->io_lock);
return ret;
}
tmp = (tmp & ~mask) | val;
ret = rk808_i2c_write(rk808, reg, 1, tmp);
DBG("reg write 0x%02x -> 0x%02x\n", (int)reg, (unsigned)val&0xff);
if (ret < 0)
return ret;
if (ret < 0){
mutex_unlock(&rk808->io_lock);
return ret;
}
ret = rk808_i2c_read(rk808, reg, 1, &tmp);
if (ret < 0)
return ret;
if (ret < 0){
mutex_unlock(&rk808->io_lock);
return ret;
}
DBG("2 reg read 0x%02x -> 0x%02x\n", (int)reg, (unsigned)tmp&0xff);
mutex_unlock(&rk808->io_lock);

23
drivers/regulator/syr82x.c
View File

@@ -388,9 +388,10 @@ static int syr82x_reg_read(struct syr82x *syr82x, u8 reg)
ret = syr82x_i2c_read(syr82x->i2c, reg, 1, &val);
DBG("reg read 0x%02x -> 0x%02x\n", (int)reg, (unsigned)val&0xff);
if (ret < 0)
if (ret < 0){
mutex_unlock(&syr82x->io_lock);
return ret;
}
mutex_unlock(&syr82x->io_lock);
return val & 0xff;
@@ -405,17 +406,23 @@ static int syr82x_set_bits(struct syr82x *syr82x, u8 reg, u16 mask, u16 val)
ret = syr82x_i2c_read(syr82x->i2c, reg, 1, &tmp);
DBG("1 reg read 0x%02x -> 0x%02x\n", (int)reg, (unsigned)tmp&0xff);
if (ret < 0)
return ret;
if (ret < 0){
mutex_unlock(&syr82x->io_lock);
return ret;
}
tmp = (tmp & ~mask) | val;
ret = syr82x_i2c_write(syr82x->i2c, reg, 1, tmp);
DBG("reg write 0x%02x -> 0x%02x\n", (int)reg, (unsigned)val&0xff);
if (ret < 0)
return ret;
if (ret < 0){
mutex_unlock(&syr82x->io_lock);
return ret;
}
ret = syr82x_i2c_read(syr82x->i2c, reg, 1, &tmp);
DBG("2 reg read 0x%02x -> 0x%02x\n", (int)reg, (unsigned)tmp&0xff);
if (ret < 0)
return ret;
if (ret < 0){
mutex_unlock(&syr82x->io_lock);
return ret;
}
mutex_unlock(&syr82x->io_lock);
return 0;//ret;