From 07e35ab7d9464a66f82ad3c9ee0301018c7238ac Mon Sep 17 00:00:00 2001 From: David Jander Date: Sun, 18 Mar 2012 23:36:29 -0700 Subject: [PATCH] --- yaml --- r: 297781 b: refs/heads/master c: 6709c9a5d8c53092cbe89128df4e0a549e93133b h: refs/heads/master i: 297779: 4ae4e103ce1bd127121e4792be356cc856ea2989 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/gpio_keys.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cbd07b68eb13..604333371d07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9080921aa32c70a95476ce387e973787b892591 +refs/heads/master: 6709c9a5d8c53092cbe89128df4e0a549e93133b diff --git a/trunk/drivers/input/keyboard/gpio_keys.c b/trunk/drivers/input/keyboard/gpio_keys.c index 19887fc10282..6f067587cdf3 100644 --- a/trunk/drivers/input/keyboard/gpio_keys.c +++ b/trunk/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);