diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 12:01:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-08 12:01:11 -0400 |
| commit | 902daf6580cffe04721250fb71b5527a98718b11 (patch) | |
| tree | 6063d27c4f0a38a10e5831882835c9d585250bd1 /drivers | |
| parent | 54af2bd25cd489fe9facca15d18a2ca7e070ab2f (diff) | |
| parent | 2345b20fd9160d99f7cdf34e7b028ea351bf9c25 (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
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 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) | |||
| 223 | gedr = gpio_reg(&lnw->chip, base, GEDR); | 223 | gedr = gpio_reg(&lnw->chip, base, GEDR); |
| 224 | pending = readl(gedr); | 224 | pending = readl(gedr); |
| 225 | while (pending) { | 225 | while (pending) { |
| 226 | gpio = __ffs(pending) - 1; | 226 | gpio = __ffs(pending); |
| 227 | mask = BIT(gpio); | 227 | mask = BIT(gpio); |
| 228 | pending &= ~mask; | 228 | pending &= ~mask; |
| 229 | /* Clear before handling so we can't lose an edge */ | 229 | /* Clear before handling so we can't lose an edge */ |