regulator: ab8500: Don't update is_enabled flag in error paths
PATCH v2 1/1 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(-)
drivers/regulator/ab8500.c +6 -2
@@ -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;
Signature · 1 line
1.7.10.4
Quoted 3 lines · Axel Lin
This avoid setting
is_enabledflag 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]>
Quoted 36 lines
---
v2: Just make the coding style consist with rest of the code.drivers/regulator/ab8500.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/regulator/ab8500.c +6
-2@@ -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;
Mark Brown
AppliedQuoted 1 line · Axel Lin
This avoid setting
is_enabledflag to wrong status if enable/disable fails.
Applied, thanks.