From 77fb1bdc45f20278092706b68b3054eb9e285b6f Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 26 Oct 2012 09:59:43 +0300
Subject: [PATCH] --- yaml --- r: 336815 b: refs/heads/master c:
 529f2ad5e374f61987a8312603963c61d75a890a h: refs/heads/master i:   336813:
 1ed7432b7b54537210a98c3f7c3cb8aa3b6afbb0   336811:
 f11d9c878edf2b09f1771053e416143a6cddf953   336807:
 e96c5a6311be3e549ad062bcd1c5c6383fc89961   336799:
 f81512963820154e5c3b648d05126b5f8c926e31 v: v3

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

diff --git a/[refs] b/[refs]
index 6f8797ff0356..d9fa0668eae7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80b0a6029272247f19146bf8f88e5d4bba94cba5
+refs/heads/master: 529f2ad5e374f61987a8312603963c61d75a890a
diff --git a/trunk/drivers/gpio/gpiolib.c b/trunk/drivers/gpio/gpiolib.c
index e468eed261c5..fd2b71c70997 100644
--- a/trunk/drivers/gpio/gpiolib.c
+++ b/trunk/drivers/gpio/gpiolib.c
@@ -756,7 +756,8 @@ int gpio_export(unsigned gpio, bool direction_may_change)
 				__func__, gpio,
 				test_bit(FLAG_REQUESTED, &desc->flags),
 				test_bit(FLAG_EXPORT, &desc->flags));
-		return -EPERM;
+		status = -EPERM;
+		goto fail_unlock;
 	}
 
 	if (!desc->chip->direction_input || !desc->chip->direction_output)