power: supply: z2_battery: Fix possible memleak in z2_batt_probe()

[ Upstream commit 955bee204f3dd307642c101b75e370662987e735 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/power/supply/z2_battery.c b/drivers/power/supply/z2_battery.c
index 7ed4e4b..fd33cdf 100644 (file)
--- a/drivers/power/supply/z2_battery.c
+++ b/drivers/power/supply/z2_battery.c
@@ -206,10 +206,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");