diff mbox series

[next] power: supply: fix a double free on error in probe()

Message ID 9c2f76e7-5679-473b-9b9c-e11b492b96ac@stanley.mountain (mailing list archive)
State Handled Elsewhere, archived
Headers show
Series [next] power: supply: fix a double free on error in probe() | expand

Commit Message

Dan Carpenter Sept. 5, 2024, 1:28 p.m. UTC
In this code, if devm_add_action_or_reset() fails, it will call
max1720x_unregister_ancillary() which in turn calls
i2c_unregister_device().  Thus the call to i2c_unregister_device() on the
following line is not required and is a double unregister.  Delete it.

Fixes: 47271a935619 ("power: supply: max1720x: add read support for nvmem")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
From code review, not tested.

 drivers/power/supply/max1720x_battery.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Sebastian Reichel Sept. 5, 2024, 2:32 p.m. UTC | #1
On Thu, 05 Sep 2024 16:28:59 +0300, Dan Carpenter wrote:
> In this code, if devm_add_action_or_reset() fails, it will call
> max1720x_unregister_ancillary() which in turn calls
> i2c_unregister_device().  Thus the call to i2c_unregister_device() on the
> following line is not required and is a double unregister.  Delete it.
> 
> 

Applied, thanks!

[1/1] power: supply: fix a double free on error in probe()
      commit: 48f703d6a3d7cf345fe9c6209ea3703fe9024628

Best regards,
diff mbox series

Patch

diff --git a/drivers/power/supply/max1720x_battery.c b/drivers/power/supply/max1720x_battery.c
index 3e84e70340e4..2bc3dce963a3 100644
--- a/drivers/power/supply/max1720x_battery.c
+++ b/drivers/power/supply/max1720x_battery.c
@@ -427,7 +427,6 @@  static int max1720x_probe_nvmem(struct i2c_client *client,
 
 	ret = devm_add_action_or_reset(dev, max1720x_unregister_ancillary, info);
 	if (ret) {
-		i2c_unregister_device(info->ancillary);
 		dev_err(dev, "Failed to add unregister callback\n");
 		return ret;
 	}