From c3fe44380eb2007fee933100dbb83aec22397aea Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Mon, 11 Mar 2013 15:34:15 +0900 Subject: [PATCH] --- yaml --- r: 367517 b: refs/heads/master c: 2a2ce52a4006db6c7831f1b21f1b0cc892516e85 h: refs/heads/master i: 367515: a6a625520203222668483d3657656d432bd16af8 v: v3 --- [refs] | 2 +- trunk/drivers/power/isp1704_charger.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e5355ea34c3e..4e9849ef8a7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3f66b3ea46237a0810d09279a38b5413aaf5d5e +refs/heads/master: 2a2ce52a4006db6c7831f1b21f1b0cc892516e85 diff --git a/trunk/drivers/power/isp1704_charger.c b/trunk/drivers/power/isp1704_charger.c index 176ad59d99f5..fc04d191579b 100644 --- a/trunk/drivers/power/isp1704_charger.c +++ b/trunk/drivers/power/isp1704_charger.c @@ -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; @@ -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; @@ -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; }