diff options
| author | Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> | 2008-10-29 22:14:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-30 15:41:50 +0100 |
| commit | 9c6568501cbf731a910db2fcb7d094977dcb154c (patch) | |
| tree | dda2ce4a1a7cd65134328fe4f199bff810ab4ba6 /arch/arm/mach-ixp4xx | |
| parent | [ARM] ep93xx: fix OHCI DMA mask (diff) | |
| download | linux-9c6568501cbf731a910db2fcb7d094977dcb154c.tar.xz linux-9c6568501cbf731a910db2fcb7d094977dcb154c.zip | |
[ARM] gpio_free might sleep, arm architecture
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 patch changes the gpio_free implementations for the arm architecture.
DaVinci is skipped on purpose to simplify the merge process for patches
switching it over to use gpiolib as per request by David Brownell.
Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Cc: David Brownell <david-b@pacbell.net>
Cc: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp4xx')
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/gpio.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/gpio.h b/arch/arm/mach-ixp4xx/include/mach/gpio.h index 9fbde177920f..cd5aec26c072 100644 --- a/arch/arm/mach-ixp4xx/include/mach/gpio.h +++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h @@ -25,6 +25,7 @@ #ifndef __ASM_ARCH_IXP4XX_GPIO_H #define __ASM_ARCH_IXP4XX_GPIO_H +#include <linux/kernel.h> #include <mach/hardware.h> static inline int gpio_request(unsigned gpio, const char *label) @@ -34,6 +35,8 @@ static inline int gpio_request(unsigned gpio, const char *label) static inline void gpio_free(unsigned gpio) { + might_sleep(); + return; } |