Commit 902daf65 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 54af2bd2 2345b20f
...@@ -223,7 +223,7 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc) ...@@ -223,7 +223,7 @@ static void lnw_irq_handler(unsigned irq, struct irq_desc *desc)
gedr = gpio_reg(&lnw->chip, base, GEDR); gedr = gpio_reg(&lnw->chip, base, GEDR);
pending = readl(gedr); pending = readl(gedr);
while (pending) { while (pending) {
gpio = __ffs(pending) - 1; gpio = __ffs(pending);
mask = BIT(gpio); mask = BIT(gpio);
pending &= ~mask; pending &= ~mask;
/* Clear before handling so we can't lose an edge */ /* Clear before handling so we can't lose an edge */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment