diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-03-11 07:35:58 +0100 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-04-01 08:25:30 +0200 |
| commit | b852ac51e25789846cb6257e737a9a1734a0d171 (patch) | |
| tree | 60f6ffd50cb00da4d8f8353d12b637a93e6facd0 /drivers/power | |
| parent | 88pm860x_charger: Drop kfree of devm_kzalloc'd data (diff) | |
| download | linux-b852ac51e25789846cb6257e737a9a1734a0d171.tar.xz linux-b852ac51e25789846cb6257e737a9a1734a0d171.zip | |
rx51_battery: 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/rx51_battery.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/power/rx51_battery.c b/drivers/power/rx51_battery.c index 8208888b844e..f9dc9ffd5f97 100644 --- a/drivers/power/rx51_battery.c +++ b/drivers/power/rx51_battery.c @@ -202,7 +202,7 @@ static int rx51_battery_probe(struct platform_device *pdev) struct rx51_device_info *di; int ret; - di = kzalloc(sizeof(*di), GFP_KERNEL); + di = devm_kzalloc(&pdev->dev, sizeof(*di), GFP_KERNEL); if (!di) return -ENOMEM; @@ -217,7 +217,6 @@ static int rx51_battery_probe(struct platform_device *pdev) ret = power_supply_register(di->dev, &di->bat); if (ret) { platform_set_drvdata(pdev, NULL); - kfree(di); return ret; } @@ -230,7 +229,6 @@ static int rx51_battery_remove(struct platform_device *pdev) power_supply_unregister(&di->bat); platform_set_drvdata(pdev, NULL); - kfree(di); return 0; } |