summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Patard (Rtp) <arnaud.patard@rtp-net.org>2012-04-18 23:16:39 +0200
committerJason Cooper <jason@lakedaemon.net>2012-05-15 03:11:47 +0000
commit92a486eabefadca1169fbf15d737feeaf2bda844 (patch)
treec54589a861f2fc468242f7e0d82bc090efabfd0b
parentee24876949c49761e61befe7435293069ddb1f38 (diff)
downloadop-kernel-dev-92a486eabefadca1169fbf15d737feeaf2bda844.zip
op-kernel-dev-92a486eabefadca1169fbf15d737feeaf2bda844.tar.gz
kirkwood/orion: fix orion_gpio_set_blink
gpio registers are for 32 gpios. Given that orion_gpio_set_blink is called directly and not through gpiolib, it needs to make sure that the pin value given to the internal functions are between 0 and 31. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Tested-By: Adam Baker <linux@baker-net.org.uk> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--arch/arm/plat-orion/gpio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c
index 10d1608..d3401e7 100644
--- a/arch/arm/plat-orion/gpio.c
+++ b/arch/arm/plat-orion/gpio.c
@@ -289,8 +289,8 @@ void orion_gpio_set_blink(unsigned pin, int blink)
return;
spin_lock_irqsave(&ochip->lock, flags);
- __set_level(ochip, pin, 0);
- __set_blinking(ochip, pin, blink);
+ __set_level(ochip, pin & 31, 0);
+ __set_blinking(ochip, pin & 31, blink);
spin_unlock_irqrestore(&ochip->lock, flags);
}
EXPORT_SYMBOL(orion_gpio_set_blink);
OpenPOWER on IntegriCloud