leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

regulator: ab8500: Don't update info->update_val if write to register fails

Browse Source 
This patch ensures info->update_val is consistent with current register value.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2013-04-09 20:15:06 +08:00 committed by Mark Brown
parent 241896ce8d
commit f04adc5ab3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/regulator/ab8500.c
View File

@ -392,9 +392,8 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev,
val = info->mode_val_idle; val = info->mode_val_idle;
break; break;
default: default:
if (info->shared_mode) ret = -EINVAL;
mutex_unlock(&shared_mode_mutex); goto out_unlock;
return -EINVAL;
} }
bank = info->mode_bank; bank = info->mode_bank;
@ -405,17 +404,14 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev,
switch (mode) { switch (mode) {
case REGULATOR_MODE_NORMAL: case REGULATOR_MODE_NORMAL:
info->update_val = info->update_val_normal;
val = info->update_val_normal; val = info->update_val_normal;
break; break;
case REGULATOR_MODE_IDLE: case REGULATOR_MODE_IDLE:
info->update_val = info->update_val_idle;
val = info->update_val_idle; val = info->update_val_idle;
break; break;
default: default:
if (info->shared_mode) ret = -EINVAL;
mutex_unlock(&shared_mode_mutex); goto out_unlock;
return -EINVAL;
} }
bank = info->update_bank; bank = info->update_bank;
@ -426,9 +422,11 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev,
if (dmr || ab8500_regulator_is_enabled(rdev)) { if (dmr || ab8500_regulator_is_enabled(rdev)) {
ret = abx500_mask_and_set_register_interruptible(info->dev, ret = abx500_mask_and_set_register_interruptible(info->dev,
bank, reg, mask, val); bank, reg, mask, val);
if (ret < 0) if (ret < 0) {
dev_err(rdev_get_dev(rdev), dev_err(rdev_get_dev(rdev),
"couldn't set regulator mode\n"); "couldn't set regulator mode\n");
goto out_unlock;
}
dev_vdbg(rdev_get_dev(rdev), dev_vdbg(rdev_get_dev(rdev),
"%s-set_mode (bank, reg, mask, value): " "%s-set_mode (bank, reg, mask, value): "
@ -437,6 +435,10 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev,
mask, val); mask, val);
} }
if (!dmr)
info->update_val = val;
out_unlock:
if (info->shared_mode) if (info->shared_mode)
mutex_unlock(&shared_mode_mutex); mutex_unlock(&shared_mode_mutex);