From c9ff3c4f9d4928ee0bb51be615232354e17a4d02 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Sun, 25 Nov 2012 10:10:20 +0530
Subject: [PATCH] --- yaml --- r: 344479 b: refs/heads/master c:
 e3b1d44c3550e5badfa5b78ffec80e15d7d9b287 h: refs/heads/master i:   344477:
 96521acee243a6e2b514799867110af34aa9db25   344475:
 e192c2a590828736813558c3fba9ce6499d321a2   344471:
 9fddb096f5614bfc90c248a921ac6d32b04ec6cf   344463:
 13104e2fbce54400860d54b2afe118b680d83306   344447:
 a9e92ac487ba9577194bb86beaa28c3823505a61 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/leds/leds-gpio.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 09257f5b6a41..718d6be92965 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4401e48737c4068604144a5c0ba23a9c82ea3a37
+refs/heads/master: e3b1d44c3550e5badfa5b78ffec80e15d7d9b287
diff --git a/trunk/drivers/leds/leds-gpio.c b/trunk/drivers/leds/leds-gpio.c
index 6a2109638fbe..77e2e4057929 100644
--- a/trunk/drivers/leds/leds-gpio.c
+++ b/trunk/drivers/leds/leds-gpio.c
@@ -126,7 +126,7 @@ static int __devinit create_gpio_led(const struct gpio_led *template,
 	if (!template->retain_state_suspended)
 		led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
 
-	ret = gpio_request_one(template->gpio,
+	ret = devm_gpio_request_one(parent, template->gpio,
 			GPIOF_DIR_OUT | (led_dat->active_low ^ state),
 			template->name);
 	if (ret < 0)
@@ -136,12 +136,9 @@ static int __devinit create_gpio_led(const struct gpio_led *template,
 
 	ret = led_classdev_register(parent, &led_dat->cdev);
 	if (ret < 0)
-		goto err;
+		return ret;
 
 	return 0;
-err:
-	gpio_free(led_dat->gpio);
-	return ret;
 }
 
 static void delete_gpio_led(struct gpio_led_data *led)
@@ -150,7 +147,6 @@ static void delete_gpio_led(struct gpio_led_data *led)
 		return;
 	led_classdev_unregister(&led->cdev);
 	cancel_work_sync(&led->work);
-	gpio_free(led->gpio);
 }
 
 struct gpio_leds_priv {