diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-03-11 02:34:15 -0400 |
---|---|---|
committer | Anton Vorontsov <anton@enomsg.org> | 2013-04-01 02:25:40 -0400 |
commit | 2a2ce52a4006db6c7831f1b21f1b0cc892516e85 (patch) | |
tree | 2df617181f1d2fe797c2bb94b7b35866f723c1d9 /drivers/power | |
parent | f3f66b3ea46237a0810d09279a38b5413aaf5d5e (diff) |
isp1704_charger: Use devm_kzalloc()
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>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/isp1704_charger.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c index 176ad59d99f5..fc04d191579b 100644 --- a/drivers/power/isp1704_charger.c +++ b/drivers/power/isp1704_charger.c | |||
@@ -411,7 +411,7 @@ static int isp1704_charger_probe(struct platform_device *pdev) | |||
411 | struct isp1704_charger *isp; | 411 | struct isp1704_charger *isp; |
412 | int ret = -ENODEV; | 412 | int ret = -ENODEV; |
413 | 413 | ||
414 | isp = kzalloc(sizeof *isp, GFP_KERNEL); | 414 | isp = devm_kzalloc(&pdev->dev, sizeof(*isp), GFP_KERNEL); |
415 | if (!isp) | 415 | if (!isp) |
416 | return -ENOMEM; | 416 | return -ENOMEM; |
417 | 417 | ||
@@ -477,8 +477,6 @@ fail1: | |||
477 | isp1704_charger_set_power(isp, 0); | 477 | isp1704_charger_set_power(isp, 0); |
478 | usb_put_phy(isp->phy); | 478 | usb_put_phy(isp->phy); |
479 | fail0: | 479 | fail0: |
480 | kfree(isp); | ||
481 | |||
482 | dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret); | 480 | dev_err(&pdev->dev, "failed to register isp1704 with error %d\n", ret); |
483 | 481 | ||
484 | return ret; | 482 | return ret; |
@@ -492,7 +490,6 @@ static int isp1704_charger_remove(struct platform_device *pdev) | |||
492 | power_supply_unregister(&isp->psy); | 490 | power_supply_unregister(&isp->psy); |
493 | usb_put_phy(isp->phy); | 491 | usb_put_phy(isp->phy); |
494 | isp1704_charger_set_power(isp, 0); | 492 | isp1704_charger_set_power(isp, 0); |
495 | kfree(isp); | ||
496 | 493 | ||
497 | return 0; | 494 | return 0; |
498 | } | 495 | } |