Hi, On Wed, May 06, 2020 at 02:20:20PM +0200, Michał Mirosław wrote: > On Wed, May 06, 2020 at 01:11:16PM +0300, Dan Carpenter wrote: > > We introduced some new locking here, but need to update the error > > paths so they unlock before returning. > > Reviewed-by: Michał Mirosław Thanks, queued. -- Sebastian > > Fixes: 72d9cd9cdc18 ("power: bq25890: protect view of the chip's state") > > Signed-off-by: Dan Carpenter > > --- > > drivers/power/supply/bq25890_charger.c | 7 ++++--- > > 1 file changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c > > index 9339e216651ff..20b9824ef5acd 100644 > > --- a/drivers/power/supply/bq25890_charger.c > > +++ b/drivers/power/supply/bq25890_charger.c > > @@ -978,21 +978,22 @@ static int bq25890_resume(struct device *dev) > > > > ret = bq25890_get_chip_state(bq, &bq->state); > > if (ret < 0) > > - return ret; > > + goto unlock; > > > > /* Re-enable ADC only if charger is plugged in. */ > > if (bq->state.online) { > > ret = bq25890_field_write(bq, F_CONV_START, 1); > > if (ret < 0) > > - return ret; > > + goto unlock; > > } > > > > /* signal userspace, maybe state changed while suspended */ > > power_supply_changed(bq->charger); > > > > +unlock: > > mutex_unlock(&bq->lock); > > > > - return 0; > > + return ret; > > } > > #endif > > > > -- > > 2.26.2 > >