android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

power/max8925: freeing wrong variable

Browse Source 
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 <dan.carpenter@oracle.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
This commit is contained in:
Dan Carpenter 2016-03-18 08:40:16 +03:00 committed by Sebastian Reichel
parent f80cb48843
commit 1285b0a30d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/power/max8925_power.c
View File

@ -540,14 +540,14 @@ static int max8925_power_probe(struct platform_device *pdev)
info->usb = power_supply_register(&pdev->dev, &usb_desc, &psy_cfg); info->usb = power_supply_register(&pdev->dev, &usb_desc, &psy_cfg);
if (IS_ERR(info->usb)) { if (IS_ERR(info->usb)) {
ret = PTR_ERR(info->usb); ret = PTR_ERR(info->usb);
goto out_usb; goto out_unregister_ac;
} }
info->usb->dev.parent = &pdev->dev; info->usb->dev.parent = &pdev->dev;
info->battery = power_supply_register(&pdev->dev, &battery_desc, NULL); info->battery = power_supply_register(&pdev->dev, &battery_desc, NULL);
if (IS_ERR(info->battery)) { if (IS_ERR(info->battery)) {
ret = PTR_ERR(info->battery); ret = PTR_ERR(info->battery);
goto out_battery; goto out_unregister_usb;
} }
info->battery->dev.parent = &pdev->dev; info->battery->dev.parent = &pdev->dev;
@ -560,9 +560,9 @@ static int max8925_power_probe(struct platform_device *pdev)
max8925_init_charger(chip, info); max8925_init_charger(chip, info);
return 0; return 0;
out_battery: out_unregister_usb:
power_supply_unregister(info->battery); power_supply_unregister(info->usb);
out_usb: out_unregister_ac:
power_supply_unregister(info->ac); power_supply_unregister(info->ac);
out: out:
return ret; return ret;