2013-04-02 12:56:23

by Axel Lin

[permalink] [raw]
Subject: [PATCH] regulator: ab8500-ext: Don't update info->is_enabled if write to register fails

Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/ab8500-ext.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
index 21b9bfb..7923e82 100644
--- a/drivers/regulator/ab8500-ext.c
+++ b/drivers/regulator/ab8500-ext.c
@@ -72,9 +72,11 @@ static int enable(struct ab8500_ext_regulator_info *info, u8 *regval)
ret = abx500_mask_and_set_register_interruptible(info->dev,
info->update_bank, info->update_reg,
info->update_mask, *regval);
- if (ret < 0)
+ if (ret < 0) {
dev_err(rdev_get_dev(info->rdev),
"couldn't set enable bits for regulator\n");
+ return ret;
+ }

info->is_enabled = true;

@@ -117,9 +119,11 @@ static int disable(struct ab8500_ext_regulator_info *info, u8 *regval)
ret = abx500_mask_and_set_register_interruptible(info->dev,
info->update_bank, info->update_reg,
info->update_mask, *regval);
- if (ret < 0)
+ if (ret < 0) {
dev_err(rdev_get_dev(info->rdev),
"couldn't set disable bits for regulator\n");
+ return ret;
+ }

info->is_enabled = false;

--
1.7.10.4



2013-04-02 13:09:17

by Bengt Jönsson

[permalink] [raw]
Subject: Re: [PATCH] regulator: ab8500-ext: Don't update info->is_enabled if write to register fails

On 04/02/2013 02:56 PM, Axel Lin wrote:
> Signed-off-by: Axel Lin <[email protected]>
Acked-by: Bengt Jonsson <[email protected]>
> ---
> drivers/regulator/ab8500-ext.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/regulator/ab8500-ext.c b/drivers/regulator/ab8500-ext.c
> index 21b9bfb..7923e82 100644
> --- a/drivers/regulator/ab8500-ext.c
> +++ b/drivers/regulator/ab8500-ext.c
> @@ -72,9 +72,11 @@ static int enable(struct ab8500_ext_regulator_info *info, u8 *regval)
> ret = abx500_mask_and_set_register_interruptible(info->dev,
> info->update_bank, info->update_reg,
> info->update_mask, *regval);
> - if (ret < 0)
> + if (ret < 0) {
> dev_err(rdev_get_dev(info->rdev),
> "couldn't set enable bits for regulator\n");
> + return ret;
> + }
>
> info->is_enabled = true;
>
> @@ -117,9 +119,11 @@ static int disable(struct ab8500_ext_regulator_info *info, u8 *regval)
> ret = abx500_mask_and_set_register_interruptible(info->dev,
> info->update_bank, info->update_reg,
> info->update_mask, *regval);
> - if (ret < 0)
> + if (ret < 0) {
> dev_err(rdev_get_dev(info->rdev),
> "couldn't set disable bits for regulator\n");
> + return ret;
> + }
>
> info->is_enabled = false;
>

2013-04-02 22:05:05

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] regulator: ab8500-ext: Don't update info->is_enabled if write to register fails

On Tue, Apr 02, 2013 at 08:56:16PM +0800, Axel Lin wrote:
> Signed-off-by: Axel Lin <[email protected]>

Applied, thanks.

Attachments:
(No filename) (124.00 B)
 signature.asc (836.00 B)
Digital signature Download all attachments