diff options
| author | Mika Westerberg <ext-mika.1.westerberg@nokia.com> | 2010-12-29 12:01:31 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-01-07 22:33:07 +0100 |
| commit | f7c5cc456211da7d0b0aefd3886e57b313a0e00f (patch) | |
| tree | a1aea5eca5b8e707c5ab94d3d2d0022653565af8 /arch/arm | |
| parent | OMAP2+: TWL: include pm header for init protos (diff) | |
| download | linux-f7c5cc456211da7d0b0aefd3886e57b313a0e00f.tar.xz linux-f7c5cc456211da7d0b0aefd3886e57b313a0e00f.zip | |
OMAP: GPIO: fix _set_gpio_triggering() for OMAP2+
In case on OMAP2+ we call set_24xx_gpio_triggering() instead of
updating reg and l values. However, at the end of the function we
perform a write:
__raw_writel(l, reg);
So on OMAP2+ we end up writing 0 to the bank->base which is not
correct (typically this points to GPIO_REVISION register).
Fix this by returning immediately after call to
set_24xx_gpio_triggering().
Signed-off-by: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 1f98e0b94847..60631f227797 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -718,7 +718,7 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) case METHOD_GPIO_24XX: case METHOD_GPIO_44XX: set_24xx_gpio_triggering(bank, gpio, trigger); - break; + return 0; #endif default: goto bad; |