Thread (10 messages) flat view 10 messages, 4 authors, 2011-01-21

Re: [PATCH] input: replace request_irq by request_any_context_irq in keyboard GPIO driver

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2011-01-20 07:53:55

Hi Philippe,

On Wed, Jan 12, 2011 at 10:41:32AM +0100, Philippe Langlais wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Philippe Langlais <redacted>
---
 drivers/input/keyboard/gpio_keys.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 6069abe..eb30063 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -322,7 +322,7 @@ static void gpio_keys_report_event(struct gpio_button_data *bdata)
 	struct gpio_keys_button *button = bdata->button;
 	struct input_dev *input = bdata->input;
 	unsigned int type = button->type ?: EV_KEY;
-	int state = (gpio_get_value(button->gpio) ? 1 : 0) ^ button->active_low;
+	int state = (gpio_get_value_cansleep(button->gpio) ? 1 : 0) ^ button->active_low;
 
 	input_event(input, type, button->code, !!state);
 	input_sync(input);
@@ -410,8 +410,8 @@ static int __devinit gpio_keys_setup_key(struct platform_device *pdev,
 	if (!button->can_disable)
 		irqflags |= IRQF_SHARED;
 
-	error = request_irq(irq, gpio_keys_isr, irqflags, desc, bdata);
-	if (error) {
+	error = request_any_context_irq(irq, gpio_keys_isr, irqflags, desc, bdata);
+	if (error < 0) {
No, this it not correct. request_any_context_irq() means that you could
either get a hardirq or a treaded one. However above you are changing to
gpio_get_value_cansleep() which indicates that you can sleep.

You need to either revert to gpio_get_value() or explicitly request
threaded IRQ.

Thanks.

-- 
Dmitry
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help