1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 40f38030b394..7d4f381d55af 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -176,7 +176,8 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
         if (!config)
                 return -ENOMEM;
 
-        drvdata = kzalloc(sizeof(struct fixed_voltage_data), GFP_KERNEL);
+        drvdata = devm_kzalloc(&pdev->dev, sizeof(struct fixed_voltage_data),
+                               GFP_KERNEL);
         if (drvdata == NULL) {
                 dev_err(&pdev->dev, "Failed to allocate device data\n");
                 ret = -ENOMEM;
@@ -270,7 +271,6 @@ err_gpio:
 err_name:
         kfree(drvdata->desc.name);
 err:
-        kfree(drvdata);
         return ret;
 }
 
@@ -282,7 +282,6 @@ static int __devexit reg_fixed_voltage_remove(struct platform_device *pdev)
         if (gpio_is_valid(drvdata->gpio))
                 gpio_free(drvdata->gpio);
         kfree(drvdata->desc.name);
-        kfree(drvdata);
 
         return 0;
 }