lkml.org 
[lkml]   [2013]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/2] regulator: ab8500: Don't update info->update_val if write to register fails
On 04/09/2013 02:15 PM, Axel Lin wrote:
> This patch ensures info->update_val is consistent with current register value.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
Looks good to me.

Acked-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
> ---
> drivers/regulator/ab8500.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
> index acdffc5..1866dbf 100644
> --- a/drivers/regulator/ab8500.c
> +++ b/drivers/regulator/ab8500.c
> @@ -392,9 +392,8 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev,
> val = info->mode_val_idle;
> break;
> default:
> - if (info->shared_mode)
> - mutex_unlock(&shared_mode_mutex);
> - return -EINVAL;
> + ret = -EINVAL;
> + goto out_unlock;
> }
>
> bank = info->mode_bank;
> @@ -405,17 +404,14 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev,
>
> switch (mode) {
> case REGULATOR_MODE_NORMAL:
> - info->update_val = info->update_val_normal;
> val = info->update_val_normal;
> break;
> case REGULATOR_MODE_IDLE:
> - info->update_val = info->update_val_idle;
> val = info->update_val_idle;
> break;
> default:
> - if (info->shared_mode)
> - mutex_unlock(&shared_mode_mutex);
> - return -EINVAL;
> + ret = -EINVAL;
> + goto out_unlock;
> }
>
> 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)) {
> ret = abx500_mask_and_set_register_interruptible(info->dev,
> bank, reg, mask, val);
> - if (ret < 0)
> + if (ret < 0) {
> dev_err(rdev_get_dev(rdev),
> "couldn't set regulator mode\n");
> + goto out_unlock;
> + }
>
> dev_vdbg(rdev_get_dev(rdev),
> "%s-set_mode (bank, reg, mask, value): "
> @@ -437,6 +435,10 @@ static int ab8500_regulator_set_mode(struct regulator_dev *rdev,
> mask, val);
> }
>
> + if (!dmr)
> + info->update_val = val;
> +
> +out_unlock:
> if (info->shared_mode)
> mutex_unlock(&shared_mode_mutex);
>



\
 
 \ /
  Last update: 2013-04-17 13:01    [W:0.059 / U:0.924 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site