power: supply: cpcap-battery: Fix missing power_supply_put()
authorTony Lindgren <tony@atomide.com>
Sun, 10 Jan 2021 19:53:50 +0000 (21:53 +0200)
committerSebastian Reichel <sre@kernel.org>
Thu, 14 Jan 2021 22:42:37 +0000 (23:42 +0100)
Fix missing power_supply_put().

Cc: Arthur Demchenkov <spinal.by@gmail.com>
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Fixes: 8b0134cc14b9 ("power: supply: cpcap-battery: Fix handling of lowered charger voltage")
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/cpcap-battery.c

index 00c2d01..283f7e0 100644 (file)
@@ -568,17 +568,21 @@ static int cpcap_battery_update_charger(struct cpcap_battery_ddata *ddata,
                                POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
                                &prop);
        if (error)
-               return error;
+               goto out_put;
 
        /* Allow charger const voltage lower than battery const voltage */
        if (const_charge_voltage > prop.intval)
-               return 0;
+               goto out_put;
 
        val.intval = const_charge_voltage;
 
-       return power_supply_set_property(charger,
+       error = power_supply_set_property(charger,
                        POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE,
                        &val);
+out_put:
+       power_supply_put(charger);
+
+       return error;
 }
 
 static int cpcap_battery_set_property(struct power_supply *psy,