---

yaml --- r: 344479 b: refs/heads/master c: e3b1d44 h: refs/heads/master i: 344477: 96521ac 344475: e192c2a 344471: 9fddb09 344463: 13104e2 344447: a9e92ac v: v3
git-mirror · Nov 27, 2012 · c9ff3c4 · c9ff3c4
1 parent a6630e5
commit c9ff3c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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 {