diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-01-10 22:53:50 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-04 13:37:55 +0300 |
| commit | 1f613374921326ed5c1fa89384e823447a607f78 (patch) | |
| tree | 76a988592c2871170f6c64863c00ff2ca099593a | |
| parent | 748f7b65d2e00802f72be8d50085d1a8c3fcf2c7 (diff) | |
| download | linux-1f613374921326ed5c1fa89384e823447a607f78.tar.xz | |
power: supply: cpcap-battery: Fix missing power_supply_put()
[ Upstream commit 97456a24acb41b74ab6910f40fb8f09b206fd3b5 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/power/supply/cpcap-battery.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c index 7a974b5bd9dd..cebc5c8fda1b 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, |