regulator: ab8500-ext: Don't update info->is_enabled if write to register fails
PATCH 1/1 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(-)
drivers/regulator/ab8500-ext.c +6 -2
@@ -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;
Signature · 1 line
1.7.10.4
Quoted 1 line · Axel Lin
Signed-off-by Axel Lin <[email protected]>
Acked-by Bengt Jonsson <[email protected]>
Quoted 34 lines
--- drivers/regulator/ab8500-ext.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/regulator/ab8500-ext.c +6
-2@@ -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;
Mark Brown
AppliedQuoted 1 line · Axel Lin
Signed-off-by Axel Lin <[email protected]>
Applied, thanks.