From b68023564e4a0074e3724df4c76913deb1dec371 Mon Sep 17 00:00:00 2001
From: Jingoo Han <jg1.han@samsung.com>
Date: Tue, 23 Oct 2012 05:18:21 -0700
Subject: [PATCH] --- yaml --- r: 344455 b: refs/heads/master c:
 31c3dc7488f2564fc398d5a416726031f56d6343 h: refs/heads/master i:   344453:
 67fd088c9285ef72f5561977df586b9c92ea3e74   344451:
 b352ca7677fde38573d32d780dbe59e4767b8918   344447:
 a9e92ac487ba9577194bb86beaa28c3823505a61 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/leds/leds-ns2.c | 21 +++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 99972939a547..9dc6c842cd9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 507d967bc1d103695440e27f888244e014bcf7be
+refs/heads/master: 31c3dc7488f2564fc398d5a416726031f56d6343
diff --git a/trunk/drivers/leds/leds-ns2.c b/trunk/drivers/leds/leds-ns2.c
index d176ec83f5d9..ae8f93b3364e 100644
--- a/trunk/drivers/leds/leds-ns2.c
+++ b/trunk/drivers/leds/leds-ns2.c
@@ -191,25 +191,18 @@ create_ns2_led(struct platform_device *pdev, struct ns2_led_data *led_dat,
 	int ret;
 	enum ns2_led_modes mode;
 
-	ret = gpio_request(template->cmd, template->name);
-	if (ret == 0) {
-		ret = gpio_direction_output(template->cmd,
-					    gpio_get_value(template->cmd));
-		if (ret)
-			gpio_free(template->cmd);
-	}
+	ret = gpio_request_one(template->cmd,
+			GPIOF_DIR_OUT | gpio_get_value(template->cmd),
+			template->name);
 	if (ret) {
 		dev_err(&pdev->dev, "%s: failed to setup command GPIO\n",
 			template->name);
+		return ret;
 	}
 
-	ret = gpio_request(template->slow, template->name);
-	if (ret == 0) {
-		ret = gpio_direction_output(template->slow,
-					    gpio_get_value(template->slow));
-		if (ret)
-			gpio_free(template->slow);
-	}
+	ret = gpio_request_one(template->slow,
+			GPIOF_DIR_OUT | gpio_get_value(template->slow),
+			template->name);
 	if (ret) {
 		dev_err(&pdev->dev, "%s: failed to setup slow GPIO\n",
 			template->name);