| Message ID | 20171122202731.13414-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Hi, On Wed, Nov 22, 2017 at 09:27:31PM +0100, Christophe JAILLET wrote: > '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> > --- Thanks, queued. -- Sebastian > drivers/power/supply/ab8500_charger.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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) > -- > 2.14.1 >
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)
'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> --- drivers/power/supply/ab8500_charger.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)