| From foo@baz Fri Mar 16 15:43:17 CET 2018 |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| Date: Wed, 22 Nov 2017 21:27:31 +0100 |
| Subject: power: supply: ab8500_charger: Fix an error handling path |
| |
| From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> |
| |
| |
| [ Upstream commit bf59fddde1c3eab89eb8dca8f3d3dc097887d2bb ] |
| |
| '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> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/power/supply/ab8500_charger.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/power/supply/ab8500_charger.c |
| +++ b/drivers/power/supply/ab8500_charger.c |
| @@ -3218,7 +3218,7 @@ static int ab8500_charger_init_hw_regist |
| } |
| |
| /* 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) |
