From 38b66423769bd10942e92aa3f4696b0eb9da455b Mon Sep 17 00:00:00 2001 From: David Jander Date: Tue, 21 Jun 2011 14:26:18 -0700 Subject: [PATCH] --- yaml --- r: 260743 b: refs/heads/master c: 7e2ecdf438bb479e2b4667fc16b1a84d6348da04 h: refs/heads/master i: 260741: 22a88831f1ea8e7b07e743bb7b1ee7ccdc0ea979 260739: 646c7264e371a59fbb41cfb44cd9b4b28077ffd0 260735: 642e0652148cd7882d6412ea6845959db784a119 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/gpio_keys.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9f3d0e5f8eb6..a562bb5e5efc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eaa499aebf6265f18ffc836ead30059031c6d7a7 +refs/heads/master: 7e2ecdf438bb479e2b4667fc16b1a84d6348da04 diff --git a/trunk/drivers/input/keyboard/gpio_keys.c b/trunk/drivers/input/keyboard/gpio_keys.c index 6e6145b9a4c1..6d0e2f64122b 100644 --- a/trunk/drivers/input/keyboard/gpio_keys.c +++ b/trunk/drivers/input/keyboard/gpio_keys.c @@ -415,7 +415,7 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev, if (!button->can_disable) irqflags |= IRQF_SHARED; - error = request_any_context_irq(irq, gpio_keys_isr, irqflags, desc, bdata); + error = request_threaded_irq(irq, NULL, gpio_keys_isr, irqflags, desc, bdata); if (error < 0) { dev_err(dev, "Unable to claim irq %d; error %d\n", irq, error); @@ -649,5 +649,5 @@ module_exit(gpio_keys_exit); MODULE_LICENSE("GPL"); MODULE_AUTHOR("Phil Blundell "); -MODULE_DESCRIPTION("Keyboard driver for CPU GPIOs"); +MODULE_DESCRIPTION("Keyboard driver for GPIOs"); MODULE_ALIAS("platform:gpio-keys");