diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2017-11-22 21:27:31 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.co.uk> | 2017-12-01 16:21:18 +0100 |
| commit | bf59fddde1c3eab89eb8dca8f3d3dc097887d2bb (patch) | |
| tree | a54593db667e270fb3dea5aacc93f66e4c53d070 /drivers/power | |
| parent | f46b151ede8668cb824a836e82303e1123f5f9f6 (diff) | |
| download | talos-obmc-linux-bf59fddde1c3eab89eb8dca8f3d3dc097887d2bb.tar.gz talos-obmc-linux-bf59fddde1c3eab89eb8dca8f3d3dc097887d2bb.zip | |
power: supply: ab8500_charger: Fix an error handling path
'ret' is know to be 0 at this point, because it has not been updated by the
the previous call to 'abx500_mask_and_set_register_interruptible()'.
Fix it by updating 'ret' before checking if an error occurred.
Fixes: 84edbeeab67c ("ab8500-charger: AB8500 charger driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/ab8500_charger.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/supply/ab8500_charger.c b/drivers/power/supply/ab8500_charger.c index 4ebbcce45c48..1cdbe7a0738d 100644 --- a/drivers/power/supply/ab8500_charger.c +++ b/drivers/power/supply/ab8500_charger.c @@ -3218,7 +3218,7 @@ static int ab8500_charger_init_hw_registers(struct ab8500_charger *di) } /* Enable backup battery charging */ - abx500_mask_and_set_register_interruptible(di->dev, + ret = abx500_mask_and_set_register_interruptible(di->dev, AB8500_RTC, AB8500_RTC_CTRL_REG, RTC_BUP_CH_ENA, RTC_BUP_CH_ENA); if (ret < 0) |
