Merge tag 'md/3.18' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / drivers / power / max8998_charger.c

diff --git a/drivers/power/max8998_charger.c b/drivers/power/max8998_charger.c
index bf677e3daec93a031a9db5f2061775dc1336c265..5017470c2fc913965bfe93020072cc08b421dae8 100644 (file)
--- a/drivers/power/max8998_charger.c
+++ b/drivers/power/max8998_charger.c
@@ -88,7 +88,8 @@ static int max8998_battery_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       max8998 = kzalloc(sizeof(struct max8998_battery_data), GFP_KERNEL);
+       max8998 = devm_kzalloc(&pdev->dev, sizeof(struct max8998_battery_data),
+                               GFP_KERNEL);
        if (!max8998)
                return -ENOMEM;
 
@@ -174,7 +175,6 @@ static int max8998_battery_probe(struct platform_device *pdev)
 
        return 0;
 err:
-       kfree(max8998);
        return ret;
 }
 
@@ -183,7 +183,6 @@ static int max8998_battery_remove(struct platform_device *pdev)
        struct max8998_battery_data *max8998 = platform_get_drvdata(pdev);
 
        power_supply_unregister(&max8998->battery);
-       kfree(max8998);
 
        return 0;
 }