From: Tony Lindgren <t...@atomide.com>

[ Upstream commit 97456a24acb41b74ab6910f40fb8f09b206fd3b5 ]

Fix missing power_supply_put().

Cc: Arthur Demchenkov <spinal...@gmail.com>
Cc: Carl Philipp Klemm <phil...@uvos.xyz>
Cc: Merlijn Wajer <merl...@wizzup.org>
Cc: Pavel Machek <pa...@ucw.cz>
Fixes: 8b0134cc14b9 ("power: supply: cpcap-battery: Fix handling of lowered 
charger voltage")
Signed-off-by: Tony Lindgren <t...@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reic...@collabora.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/power/supply/cpcap-battery.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/power/supply/cpcap-battery.c 
b/drivers/power/supply/cpcap-battery.c
index 7a974b5bd9dd1..cebc5c8fda1b5 100644
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -561,17 +561,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,
-- 
2.27.0



Reply via email to