summaryrefslogtreecommitdiffstats
path: root/drivers/power/supply
diff options
context:
space:
mode:
authorZhang Qilong <zhangqilong3@huawei.com>2022-11-21 09:18:31 +0800
committerSebastian Reichel <sebastian.reichel@collabora.com>2022-11-24 22:46:06 +0100
commit955bee204f3dd307642c101b75e370662987e735 (patch)
tree93f862f409204f0dd720599b8027a7842984e463 /drivers/power/supply
parent922bde5a095540fe3870245e4f0b625a20967ea4 (diff)
downloadlinux-stable-955bee204f3dd307642c101b75e370662987e735.tar.gz
linux-stable-955bee204f3dd307642c101b75e370662987e735.tar.bz2
linux-stable-955bee204f3dd307642c101b75e370662987e735.zip
power: supply: z2_battery: Fix possible memleak in z2_batt_probe()
If devm_gpiod_get_optional() returns error, the charger should be freed before z2_batt_probe returns according to the context. We fix it by just gotoing to 'err' branch. Fixes: a3b4388ea19b ("power: supply: z2_battery: Convert to GPIO descriptors") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/supply')
-rw-r--r--drivers/power/supply/z2_battery.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/power/supply/z2_battery.c b/drivers/power/supply/z2_battery.c
index eb01b01bf593..0ba4a590a0a5 100644
--- a/drivers/power/supply/z2_battery.c
+++ b/drivers/power/supply/z2_battery.c
@@ -205,10 +205,12 @@ static int z2_batt_probe(struct i2c_client *client)
charger->charge_gpiod = devm_gpiod_get_optional(&client->dev,
NULL, GPIOD_IN);
- if (IS_ERR(charger->charge_gpiod))
- return dev_err_probe(&client->dev,
+ if (IS_ERR(charger->charge_gpiod)) {
+ ret = dev_err_probe(&client->dev,
PTR_ERR(charger->charge_gpiod),
"failed to get charge GPIO\n");
+ goto err;
+ }
if (charger->charge_gpiod) {
gpiod_set_consumer_name(charger->charge_gpiod, "BATT CHRG");