From: David Jander Date: Mon, 19 Mar 2012 06:36:29 +0000 (-0700) Subject: Input: revert "gpio_keys - switch to using threaded IRQs" X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6709c9a5d8c53092cbe89128df4e0a549e93133b;p=mv-sheeva.git 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 --- 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);