From d7636d1f0297836b21802a44fafd25260564ff3d Mon Sep 17 00:00:00 2001
From: Aaro Koskinen <aaro.koskinen@nokia.com>
Date: Tue, 21 Dec 2010 17:24:22 -0800
Subject: [PATCH] --- yaml --- r: 223508 b: refs/heads/master c:
 e254811c205ec539b648cff54a7852ee8dcd2e5e h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/gpio/gpiolib.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b1da709fc87c..ce5ff57e4a15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d153ba64450b9371158c6516d6cac120faace44c
+refs/heads/master: e254811c205ec539b648cff54a7852ee8dcd2e5e
diff --git a/trunk/drivers/gpio/gpiolib.c b/trunk/drivers/gpio/gpiolib.c
index 21da9c19a0cb..649550e2cae9 100644
--- a/trunk/drivers/gpio/gpiolib.c
+++ b/trunk/drivers/gpio/gpiolib.c
@@ -1281,6 +1281,9 @@ int gpio_request_one(unsigned gpio, unsigned long flags, const char *label)
 		err = gpio_direction_output(gpio,
 				(flags & GPIOF_INIT_HIGH) ? 1 : 0);
 
+	if (err)
+		gpio_free(gpio);
+
 	return err;
 }
 EXPORT_SYMBOL_GPL(gpio_request_one);