From: "Bengt Jönsson" <bengt.g.jonsson@stericsson.com>
To: Axel Lin <axel.lin@ingics.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
Lee Jones <lee.jones@linaro.org>,
Yvan FILLION <yvan.fillion@stericsson.com>,
Liam Girdwood <lgirdwood@gmail.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 1/2] regulator: ab8500: Don't update info->update_val if write to register fails
Date: Wed, 17 Apr 2013 11:48:28 +0200 [thread overview]
Message-ID: <516E6FEC.9030401@stericsson.com> (raw)
In-Reply-To: <1365509706.3801.1.camel@phoenix>
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);
>
next prev parent reply other threads:[~2013-04-17 10:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 12:15 [PATCH 1/2] regulator: ab8500: Don't update info->update_val if write to register fails Axel Lin
2013-04-09 12:17 ` [PATCH 2/2] regulator: ab8500: Don't update lp_mode_req flag in set_mode() error paths Axel Lin
2013-04-17 9:49 ` Bengt Jönsson
2013-04-16 16:51 ` [PATCH 1/2] regulator: ab8500: Don't update info->update_val if write to register fails Axel Lin
2013-04-17 9:48 ` Bengt Jönsson [this message]
2013-04-17 14:09 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=516E6FEC.9030401@stericsson.com \
--to=bengt.g.jonsson@stericsson.com \
--cc=axel.lin@ingics.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=yvan.fillion@stericsson.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).