leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power: bq25890: unlock on error paths in bq25890_resume()

Browse Source 
We introduced some new locking here, but need to update the error
paths so they unlock before returning.

Fixes: 72d9cd9cdc ("power: bq25890: protect view of the chip's state")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
This commit is contained in:
Dan Carpenter 2020-05-06 13:11:16 +03:00 committed by Sebastian Reichel
parent 2ad3d74e3c
commit cf5701bf74
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/power/supply/bq25890_charger.c
View File

@ -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