diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 16:01:11 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 16:01:11 (GMT) |
| commit | 902daf6580cffe04721250fb71b5527a98718b11 (patch) | |
| tree | 6063d27c4f0a38a10e5831882835c9d585250bd1 /drivers | |
| parent | 54af2bd25cd489fe9facca15d18a2ca7e070ab2f (diff) | |
| parent | 2345b20fd9160d99f7cdf34e7b028ea351bf9c25 (diff) | |
| download | linux-902daf6580cffe04721250fb71b5527a98718b11.tar.xz | |
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
gpio/langwell_gpio: ack the correct bit for langwell gpio interrupts
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/langwell_gpio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c index bd6571e..644ba12 100644 --- a/drivers/gpio/langwell_gpio.c +++ b/drivers/gpio/langwell_gpio.c @@ -223,7 +223,7 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc) gedr = gpio_reg(&lnw->chip, base, GEDR); pending = readl(gedr); while (pending) { - gpio = __ffs(pending) - 1; + gpio = __ffs(pending); mask = BIT(gpio); pending &= ~mask; /* Clear before handling so we can't lose an edge */ |