aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/power/da9030_battery.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/power/da9030_battery.c b/drivers/power/da9030_battery.c
index e8c5a391a498..ae6c41835ee6 100644
--- a/drivers/power/da9030_battery.c
+++ b/drivers/power/da9030_battery.c
@@ -505,7 +505,7 @@ static int da9030_battery_probe(struct platform_device *pdev)
505 pdata->charge_millivolt > 4350) 505 pdata->charge_millivolt > 4350)
506 return -EINVAL; 506 return -EINVAL;
507 507
508 charger = kzalloc(sizeof(*charger), GFP_KERNEL); 508 charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL);
509 if (charger == NULL) 509 if (charger == NULL)
510 return -ENOMEM; 510 return -ENOMEM;
511 511
@@ -557,8 +557,6 @@ err_notifier:
557 cancel_delayed_work(&charger->work); 557 cancel_delayed_work(&charger->work);
558 558
559err_charger_init: 559err_charger_init:
560 kfree(charger);
561
562 return ret; 560 return ret;
563} 561}
564 562
@@ -575,8 +573,6 @@ static int da9030_battery_remove(struct platform_device *dev)
575 da9030_set_charge(charger, 0); 573 da9030_set_charge(charger, 0);
576 power_supply_unregister(&charger->psy); 574 power_supply_unregister(&charger->psy);
577 575
578 kfree(charger);
579
580 return 0; 576 return 0;
581} 577}
582 578