Merge tag 'afs-fixes-04012021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...

[linux-2.6-microblaze.git] / drivers / power / supply / bq24190_charger.c

diff --git a/drivers/power/supply/bq24190_charger.c b/drivers/power/supply/bq24190_charger.c
index d141865..4841e14 100644 (file)
--- a/drivers/power/supply/bq24190_charger.c
+++ b/drivers/power/supply/bq24190_charger.c
@@ -16,7 +16,6 @@
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>
 #include <linux/workqueue.h>
-#include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/extcon-provider.h>
 
@@ -448,8 +447,10 @@ static ssize_t bq24190_sysfs_show(struct device *dev,
                return -EINVAL;
 
        ret = pm_runtime_get_sync(bdi->dev);
-       if (ret < 0)
+       if (ret < 0) {
+               pm_runtime_put_noidle(bdi->dev);
                return ret;
+       }
 
        ret = bq24190_read_mask(bdi, info->reg, info->mask, info->shift, &v);
        if (ret)
@@ -1077,8 +1078,10 @@ static int bq24190_charger_get_property(struct power_supply *psy,
        dev_dbg(bdi->dev, "prop: %d\n", psp);
 
        ret = pm_runtime_get_sync(bdi->dev);
-       if (ret < 0)
+       if (ret < 0) {
+               pm_runtime_put_noidle(bdi->dev);
                return ret;
+       }
 
        switch (psp) {
        case POWER_SUPPLY_PROP_CHARGE_TYPE:
@@ -1149,8 +1152,10 @@ static int bq24190_charger_set_property(struct power_supply *psy,
        dev_dbg(bdi->dev, "prop: %d\n", psp);
 
        ret = pm_runtime_get_sync(bdi->dev);
-       if (ret < 0)
+       if (ret < 0) {
+               pm_runtime_put_noidle(bdi->dev);
                return ret;
+       }
 
        switch (psp) {
        case POWER_SUPPLY_PROP_ONLINE:
@@ -1410,8 +1415,10 @@ static int bq24190_battery_get_property(struct power_supply *psy,
        dev_dbg(bdi->dev, "prop: %d\n", psp);
 
        ret = pm_runtime_get_sync(bdi->dev);
-       if (ret < 0)
+       if (ret < 0) {
+               pm_runtime_put_noidle(bdi->dev);
                return ret;
+       }
 
        switch (psp) {
        case POWER_SUPPLY_PROP_STATUS:
@@ -1456,8 +1463,10 @@ static int bq24190_battery_set_property(struct power_supply *psy,
        dev_dbg(bdi->dev, "prop: %d\n", psp);
 
        ret = pm_runtime_get_sync(bdi->dev);
-       if (ret < 0)
+       if (ret < 0) {
+               pm_runtime_put_noidle(bdi->dev);
                return ret;
+       }
 
        switch (psp) {
        case POWER_SUPPLY_PROP_ONLINE: