* [PATCH v2] regulator: ab8500: Don't update is_enabled flag in error paths
@ 2013-03-26 8:13 Axel Lin
2013-03-26 8:48 ` Bengt Jönsson
2013-03-26 14:04 ` Mark Brown
0 siblings, 2 replies; 3+ messages in thread
From: Axel Lin @ 2013-03-26 8:13 UTC (permalink / raw)
To: Mark Brown
Cc: Bengt Jonsson, Lee Jones, Yvan FILLION, Liam Girdwood,
linux-kernel
This avoid setting is_enabled flag to wrong status if enable/disable fails.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] regulator: ab8500: Don't update is_enabled flag in error paths
2013-03-26 8:13 [PATCH v2] regulator: ab8500: Don't update is_enabled flag in error paths Axel Lin
@ 2013-03-26 8:48 ` Bengt Jönsson
2013-03-26 14:04 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Bengt Jönsson @ 2013-03-26 8:48 UTC (permalink / raw)
To: Axel Lin
Cc: Mark Brown, Lee Jones, Yvan FILLION, Liam Girdwood,
linux-kernel@vger.kernel.org
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 <axel.lin@ingics.com>
Looks good to me, thanks.
Acked-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
> ---
> 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;
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] regulator: ab8500: Don't update is_enabled flag in error paths
2013-03-26 8:13 [PATCH v2] regulator: ab8500: Don't update is_enabled flag in error paths Axel Lin
2013-03-26 8:48 ` Bengt Jönsson
@ 2013-03-26 14:04 ` Mark Brown
1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2013-03-26 14:04 UTC (permalink / raw)
To: Axel Lin
Cc: Bengt Jonsson, Lee Jones, Yvan FILLION, Liam Girdwood,
linux-kernel
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
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.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-03-26 14:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-26 8:13 [PATCH v2] regulator: ab8500: Don't update is_enabled flag in error paths Axel Lin
2013-03-26 8:48 ` Bengt Jönsson
2013-03-26 14:04 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox