2013-03-26 08:13:23

by Axel Lin

[permalink] [raw]

Subject: [PATCH v2] regulator: ab8500: Don't update is_enabled flag in error paths

---

This avoid setting is_enabled flag to wrong status if enable/disable fails.

Signed-off-by: Axel Lin <[email protected]>
---
v2: Just make the coding style consist with rest of the code.

drivers/regulator/ab8500.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index 12e2740..4a70323 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -117,9 +117,11 @@ static int ab8500_regulator_enable(struct regulator_dev *rdev)
ret = abx500_mask_and_set_register_interruptible(info->dev,
info->update_bank, info->update_reg,
info->update_mask, info->update_val);
- if (ret < 0)
+ if (ret < 0) {
dev_err(rdev_get_dev(rdev),
"couldn't set enable bits for regulator\n");
+ return ret;
+ }

info->is_enabled = true;

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

info->is_enabled = false;

--
1.7.10.4

2013-03-26 08:48:35

by Bengt Jönsson

[permalink] [raw]

Subject: Re: [PATCH v2] regulator: ab8500: Don't update is_enabled flag in error paths

---

On 03/26/2013 09:13 AM, Axel Lin wrote:
> This avoid setting is_enabled flag to wrong status if enable/disable fails.
>
> Signed-off-by: Axel Lin <[email protected]>
Looks good to me, thanks.

Acked-by: Bengt Jonsson <[email protected]>
> ---
> v2: Just make the coding style consist with rest of the code.
>
> drivers/regulator/ab8500.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
> index 12e2740..4a70323 100644
> --- a/drivers/regulator/ab8500.c
> +++ b/drivers/regulator/ab8500.c
> @@ -117,9 +117,11 @@ static int ab8500_regulator_enable(struct regulator_dev *rdev)
> ret = abx500_mask_and_set_register_interruptible(info->dev,
> info->update_bank, info->update_reg,
> info->update_mask, info->update_val);
> - if (ret < 0)
> + if (ret < 0) {
> dev_err(rdev_get_dev(rdev),
> "couldn't set enable bits for regulator\n");
> + return ret;
> + }
>
> info->is_enabled = true;
>
> @@ -144,9 +146,11 @@ static int ab8500_regulator_disable(struct regulator_dev *rdev)
> ret = abx500_mask_and_set_register_interruptible(info->dev,
> info->update_bank, info->update_reg,
> info->update_mask, 0x0);
> - if (ret < 0)
> + if (ret < 0) {
> dev_err(rdev_get_dev(rdev),
> "couldn't set disable bits for regulator\n");
> + return ret;
> + }
>
> info->is_enabled = false;
>

2013-03-26 14:04:47

by Mark Brown

[permalink] [raw]

Subject: Re: [PATCH v2] regulator: ab8500: Don't update is_enabled flag in error paths

---

On Tue, Mar 26, 2013 at 04:13:14PM +0800, Axel Lin wrote:
> This avoid setting is_enabled flag to wrong status if enable/disable fails.

Applied, thanks.

---

Attachments:

(No filename) (154.00 B)
signature.asc (836.00 B)
Digital signature Download all attachments