From bebc24ee8a592d5c85af81d53c24f1eb027a0655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?=
 <ukleinek@informatik.uni-freiburg.de>
Date: Wed, 15 Oct 2008 22:03:12 -0700
Subject: [PATCH] --- yaml --- r: 114820 b: refs/heads/master c:
 3d599d1ca57f443e5c4ff5af1e69d90350082f77 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 1a06b09fcc01..4dd083d461f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c557fa3e4c156b8713c177d9dde08920130bf551
+refs/heads/master: 3d599d1ca57f443e5c4ff5af1e69d90350082f77
diff --git a/trunk/drivers/gpio/gpiolib.c b/trunk/drivers/gpio/gpiolib.c
index 8d2940517c99..317004fd94fb 100644
--- a/trunk/drivers/gpio/gpiolib.c
+++ b/trunk/drivers/gpio/gpiolib.c
@@ -792,6 +792,8 @@ void gpio_free(unsigned gpio)
 	unsigned long		flags;
 	struct gpio_desc	*desc;
 
+	might_sleep();
+
 	if (!gpio_is_valid(gpio)) {
 		WARN_ON(extra_checks);
 		return;
diff --git a/trunk/include/linux/gpio.h b/trunk/include/linux/gpio.h
index 730a20b83576..e10c49a5b96e 100644
--- a/trunk/include/linux/gpio.h
+++ b/trunk/include/linux/gpio.h
@@ -8,6 +8,7 @@
 
 #else
 
+#include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 
@@ -32,6 +33,8 @@ static inline int gpio_request(unsigned gpio, const char *label)
 
 static inline void gpio_free(unsigned gpio)
 {
+	might_sleep();
+
 	/* GPIO can never have been requested */
 	WARN_ON(1);
 }