summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-08 09:01:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-08 09:01:11 -0700
commit902daf6580cffe04721250fb71b5527a98718b11 (patch)
tree6063d27c4f0a38a10e5831882835c9d585250bd1
parent54af2bd25cd489fe9facca15d18a2ca7e070ab2f (diff)
parent2345b20fd9160d99f7cdf34e7b028ea351bf9c25 (diff)
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
-rw-r--r--drivers/gpio/langwell_gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c
index bd6571e0097a..644ba1255d3c 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 */