From 6e0457a3a80cf02939ef48e52a19f15439eb50c5 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 5 Jun 2012 17:22:09 +0100
Subject: [PATCH] --- yaml --- r: 318445 b: refs/heads/master c:
 f8d203c049af2faaa4a23e51e1626b7660b33d8e h: refs/heads/master i:   318443:
 ddc7c491c1406dc9ce9eec9ba48952b0e4a24e6a v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/gpio/gpio-wm8994.c | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 688e69790ac5..c20d454b4cd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 224a1f90458b5005fa7aec5e8a6d64fd8eccb208
+refs/heads/master: f8d203c049af2faaa4a23e51e1626b7660b33d8e
diff --git a/trunk/drivers/gpio/gpio-wm8994.c b/trunk/drivers/gpio/gpio-wm8994.c
index a1c7ba94b523..f2b3d19dd7a9 100644
--- a/trunk/drivers/gpio/gpio-wm8994.c
+++ b/trunk/drivers/gpio/gpio-wm8994.c
@@ -249,7 +249,8 @@ static int __devinit wm8994_gpio_probe(struct platform_device *pdev)
 	struct wm8994_gpio *wm8994_gpio;
 	int ret;
 
-	wm8994_gpio = kzalloc(sizeof(*wm8994_gpio), GFP_KERNEL);
+	wm8994_gpio = devm_kzalloc(&pdev->dev, sizeof(*wm8994_gpio),
+				   GFP_KERNEL);
 	if (wm8994_gpio == NULL)
 		return -ENOMEM;
 
@@ -274,20 +275,14 @@ static int __devinit wm8994_gpio_probe(struct platform_device *pdev)
 	return ret;
 
 err:
-	kfree(wm8994_gpio);
 	return ret;
 }
 
 static int __devexit wm8994_gpio_remove(struct platform_device *pdev)
 {
 	struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);
-	int ret;
-
-	ret = gpiochip_remove(&wm8994_gpio->gpio_chip);
-	if (ret == 0)
-		kfree(wm8994_gpio);
 
-	return ret;
+	return gpiochip_remove(&wm8994_gpio->gpio_chip);
 }
 
 static struct platform_driver wm8994_gpio_driver = {