Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers

The pxa regulator branch removes the bq24022 driver, while a lot of
other regulator drivers got added in the regulator tree. This
resolves the trivial conflicts by merging in the regulator patches
that are already merged into v3.4.

Conflicts:
	drivers/regulator/Kconfig
	drivers/regulator/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c
index 435e335d6e67..75ed402d9f43 100644
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@ -241,7 +241,7 @@ static __devinit int wm8994_ldo_probe(struct platform_device *pdev)
         if (!pdata)
                 return -ENODEV;
 
-        ldo = kzalloc(sizeof(struct wm8994_ldo), GFP_KERNEL);
+        ldo = devm_kzalloc(&pdev->dev, sizeof(struct wm8994_ldo), GFP_KERNEL);
         if (ldo == NULL) {
                 dev_err(&pdev->dev, "Unable to allocate private data\n");
                 return -ENOMEM;
@@ -285,7 +285,6 @@ err_gpio:
         if (gpio_is_valid(ldo->enable))
                 gpio_free(ldo->enable);
 err:
-        kfree(ldo);
         return ret;
 }
 
@@ -298,7 +297,6 @@ static __devexit int wm8994_ldo_remove(struct platform_device *pdev)
         regulator_unregister(ldo->regulator);
         if (gpio_is_valid(ldo->enable))
                 gpio_free(ldo->enable);
-        kfree(ldo);
 
         return 0;
 }