Commit 3d599d1c authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Linus Torvalds

gpio_free might sleep, generic part

According to the documentation gpio_free should only be called from task
context only.  To make this more explicit add a might sleep to all
implementations.

This is the generic part which changes gpiolib and the fallback
implementation only.
Signed-off-by: default avatarUwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c557fa3e
...@@ -792,6 +792,8 @@ void gpio_free(unsigned gpio) ...@@ -792,6 +792,8 @@ void gpio_free(unsigned gpio)
unsigned long flags; unsigned long flags;
struct gpio_desc *desc; struct gpio_desc *desc;
might_sleep();
if (!gpio_is_valid(gpio)) { if (!gpio_is_valid(gpio)) {
WARN_ON(extra_checks); WARN_ON(extra_checks);
return; return;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#else #else
#include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -32,6 +33,8 @@ static inline int gpio_request(unsigned gpio, const char *label) ...@@ -32,6 +33,8 @@ static inline int gpio_request(unsigned gpio, const char *label)
static inline void gpio_free(unsigned gpio) static inline void gpio_free(unsigned gpio)
{ {
might_sleep();
/* GPIO can never have been requested */ /* GPIO can never have been requested */
WARN_ON(1); WARN_ON(1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment