Skip to content

Commit

Permalink
isp1704_charger: Use devm_kzalloc()
Browse files Browse the repository at this point in the history 
Use devm_kzalloc() to make cleanup paths more simple.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Anton Vorontsov <anton@enomsg.org>
  • Loading branch information
Jingoo Han authored and Anton Vorontsov committed Apr 1, 2013
1 parent f3f66b3 commit 2a2ce52
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/power/isp1704_charger.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ static int isp1704_charger_probe(struct platform_device *pdev)
struct isp1704_charger *isp;
int ret = -ENODEV;

isp = kzalloc(sizeof *isp, GFP_KERNEL);
isp = devm_kzalloc(&pdev->dev, sizeof(*isp), GFP_KERNEL);
if (!isp)
return -ENOMEM;

Expand Down Expand Up @@ -477,8 +477,6 @@ static int isp1704_charger_probe(struct platform_device *pdev)
isp1704_charger_set_power(isp, 0);
usb_put_phy(isp->phy);
fail0:
kfree(isp);

dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret);

return ret;
Expand All @@ -492,7 +490,6 @@ static int isp1704_charger_remove(struct platform_device *pdev)
power_supply_unregister(&isp->psy);
usb_put_phy(isp->phy);
isp1704_charger_set_power(isp, 0);
kfree(isp);

return 0;
}
Expand Down

0 comments on commit 2a2ce52

Please sign in to comment.