Skip to contentSkip to conversation

power/max8925: freeing wrong variable

PATCH In review Dan Carpenter 2 participants 2 messages Mar 18, 2016 – Apr 10, 2016 Kernel janitors

lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 power/max8925: freeing wrong variable

We were freeing "info->battery" instead of "info->usb", which leads to an OOps and a resource leak.

The labels were wonky, "out_battery" did release the battery but out_usb did not release usb. I was introducing a call to free usb so it sort conflicted with existing misleading name. I renamed them.

Signed-off-by Dan Carpenter <[email protected]>
drivers/power/max8925_power.c +5 -5
index 57eb5c2..3b94620 100644
@@ -540,14 +540,14 @@ static int max8925_power_probe(struct platform_device *pdev)
 	info->usb = power_supply_register(&pdev->dev, &usb_desc, &psy_cfg);
 	if (IS_ERR(info->usb)) {
 		ret = PTR_ERR(info->usb);
-		goto out_usb;
+		goto out_unregister_ac;
 	}
 	info->usb->dev.parent = &pdev->dev;
 
 	info->battery = power_supply_register(&pdev->dev, &battery_desc, NULL);
 	if (IS_ERR(info->battery)) {
 		ret = PTR_ERR(info->battery);
-		goto out_battery;
+		goto out_unregister_usb;
 	}
 	info->battery->dev.parent = &pdev->dev;
 

@@ -560,9 +560,9 @@ static int max8925_power_probe(struct platform_device *pdev)
 
 	max8925_init_charger(chip, info);
 	return 0;
-out_battery:
-	power_supply_unregister(info->battery);
-out_usb:
+out_unregister_usb:
+	power_supply_unregister(info->usb);
+out_unregister_ac:
 	power_supply_unregister(info->ac);
 out:
 	return ret;
#1 lore raw

Hi,

Quoted 8 lines · Dan Carpenter

We were freeing "info->battery" instead of "info->usb", which leads to an OOps and a resource leak.

The labels were wonky, "out_battery" did release the battery but out_usb did not release usb. I was introducing a call to free usb so it sort conflicted with existing misleading name. I renamed them.

Signed-off-by Dan Carpenter <[email protected]>

Thanks, queued.

-- Sebastian