power: bq25890: unlock on error paths in bq25890_resume()
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 6 May 2020 10:11:16 +0000 (13:11 +0300)
committerSebastian Reichel <sre@kernel.org>
Fri, 8 May 2020 23:59:37 +0000 (01:59 +0200)
We introduced some new locking here, but need to update the error
paths so they unlock before returning.

Fixes: 72d9cd9cdc18 ("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>
drivers/power/supply/bq25890_charger.c

index 9339e21..20b9824 100644 (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