diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 08:00:25 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 08:00:25 +0200 |
| commit | 31881d74b6dd1a6c530cff61248def4f2da38bee (patch) | |
| tree | be62420cf39192074e13b25553d172b9d5e58a33 /drivers/power/isp1704_charger.c | |
| parent | Input: wacom_i2c - implement hovering capability (diff) | |
| parent | Input: MT - Specify that ABS_MT_SLOT must have a minimum of 0 (diff) | |
| download | linux-31881d74b6dd1a6c530cff61248def4f2da38bee.tar.xz linux-31881d74b6dd1a6c530cff61248def4f2da38bee.zip | |
Merge branch 'for-next' of git://github.com/rydberg/linux into next
Pull in changes from Henrik: "a trivial MT documentation fix".
Diffstat (limited to 'drivers/power/isp1704_charger.c')
| -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) 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 @@ fail1: 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; } |