diff options
author | David Jander <david@protonic.nl> | 2012-03-18 23:36:29 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 17:56:04 -0700 |
commit | 6709c9a5d8c53092cbe89128df4e0a549e93133b (patch) | |
tree | 55f83aeda4893a9df56a4395cbd82889687a2040 /drivers/input | |
parent | d9080921aa32c70a95476ce387e973787b892591 (diff) | |
download | linux-3.10-6709c9a5d8c53092cbe89128df4e0a549e93133b.tar.gz linux-3.10-6709c9a5d8c53092cbe89128df4e0a549e93133b.tar.bz2 linux-3.10-6709c9a5d8c53092cbe89128df4e0a549e93133b.zip |
Input: revert "gpio_keys - switch to using threaded IRQs"
request_any_context_irq() should handle the case when using GPIO expanders
that themselves use threaded IRQs, and so the premise of change
7e2ecdf438bb479e2b4667fc16b1a84d6348da04 is incorrect.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/gpio_keys.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 19887fc1028..6f067587cdf 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -421,7 +421,7 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev, if (!button->can_disable) irqflags |= IRQF_SHARED; - error = request_threaded_irq(irq, NULL, gpio_keys_isr, irqflags, desc, bdata); + error = request_any_context_irq(irq, gpio_keys_isr, irqflags, desc, bdata); if (error < 0) { dev_err(dev, "Unable to claim irq %d; error %d\n", irq, error); |