|
@@ -138,7 +138,8 @@ static int max8997_battery_probe(struct platform_device *pdev)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- charger = kzalloc(sizeof(struct charger_data), GFP_KERNEL);
|
|
|
+ charger = devm_kzalloc(&pdev->dev, sizeof(struct charger_data),
|
|
|
+ GFP_KERNEL);
|
|
|
if (charger == NULL) {
|
|
|
dev_err(&pdev->dev, "Cannot allocate memory.\n");
|
|
|
return -ENOMEM;
|
|
@@ -158,13 +159,10 @@ static int max8997_battery_probe(struct platform_device *pdev)
|
|
|
ret = power_supply_register(&pdev->dev, &charger->battery);
|
|
|
if (ret) {
|
|
|
dev_err(&pdev->dev, "failed: power supply register\n");
|
|
|
- goto err;
|
|
|
+ return ret;
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
|
-err:
|
|
|
- kfree(charger);
|
|
|
- return ret;
|
|
|
}
|
|
|
|
|
|
static int max8997_battery_remove(struct platform_device *pdev)
|
|
@@ -172,7 +170,6 @@ static int max8997_battery_remove(struct platform_device *pdev)
|
|
|
struct charger_data *charger = platform_get_drvdata(pdev);
|
|
|
|
|
|
power_supply_unregister(&charger->battery);
|
|
|
- kfree(charger);
|
|
|
return 0;
|
|
|
}
|
|
|
|