Merge tag 'rxrpc-20140126' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells...

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

diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
index 14e2b96d93b0f8eb43cc78379804cfe818bf9049..08f0d7909b6b9a2c95a90ee0292bd301129eb52b 100644 (file)
--- a/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@ -189,7 +189,7 @@ static int max8903_probe(struct platform_device *pdev)
        int ta_in = 0;
        int usb_in = 0;
 
-       data = kzalloc(sizeof(struct max8903_data), GFP_KERNEL);
+       data = devm_kzalloc(dev, sizeof(struct max8903_data), GFP_KERNEL);
        if (data == NULL) {
                dev_err(dev, "Cannot allocate memory.\n");
                return -ENOMEM;
@@ -341,7 +341,6 @@ err_dc_irq:
 err_psy:
        power_supply_unregister(&data->psy);
 err:
-       kfree(data);
        return ret;
 }
 
@@ -359,7 +358,6 @@ static int max8903_remove(struct platform_device *pdev)
                if (pdata->dc_valid)
                        free_irq(gpio_to_irq(pdata->dok), data);
                power_supply_unregister(&data->psy);
-               kfree(data);
        }
 
        return 0;