aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-ns9xxx/gpio.c
diff options
context:
space:
mode:
authorUwe Kleine-König <ukleinek@informatik.uni-freiburg.de>2008-10-29 14:14:54 -0700
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-30 14:41:50 +0000
commit9c6568501cbf731a910db2fcb7d094977dcb154c (patch)
treedda2ce4a1a7cd65134328fe4f199bff810ab4ba6 /arch/arm/mach-ns9xxx/gpio.c
parent63890a0ee1af994122094bd01f87ea6251631a3f (diff)
downloadlinux-linaro-stable-9c6568501cbf731a910db2fcb7d094977dcb154c.tar.gz
[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-ns9xxx/gpio.c')
-rw-r--r--arch/arm/mach-ns9xxx/gpio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ns9xxx/gpio.c b/arch/arm/mach-ns9xxx/gpio.c
index 5241e6a286cc..5503ca09c4ae 100644
--- a/arch/arm/mach-ns9xxx/gpio.c
+++ b/arch/arm/mach-ns9xxx/gpio.c
@@ -8,6 +8,7 @@
* under the terms of the GNU General Public License version 2 as published by
* the Free Software Foundation.
*/
+#include <linux/kernel.h>
#include <linux/compiler.h>
#include <linux/init.h>
#include <linux/spinlock.h>
@@ -63,6 +64,7 @@ EXPORT_SYMBOL(gpio_request);
void gpio_free(unsigned gpio)
{
+ might_sleep();
clear_bit(gpio, gpiores);
return;
}