[PATCH 1/2] gpio_keys: add gpio_to_irq return code check

[PATCH 1/2] gpio_keys: add gpio_to_irq return code check

[Anti Sullin]

As David Brownell pointed out when reviewing my suspend patch to 
gpio_keys, the original gpio_keys driver does not check gpio_to_irq 
return code.

This patch adds the gpio_to_irq return code check to gpio_keys and 
moves the IRQ edge type setting to request_irq flags to avoid changing 
the irq type before we have confirmed we can use it.

Signed-off-by: Anti Sullin <anti.sullin@artecdesign.ee> 

---

diff -pur clean/linux-2.6.23-rc5-at91/drivers/input/keyboard/gpio_keys.c linux-2.6.23-rc5-at91/drivers/input/keyboard/gpio_keys.c
--- clean/linux-2.6.23-rc5-at91/drivers/input/keyboard/gpio_keys.c	2007-09-01 09:08:24.000000000 +0300
+++ linux-2.6.23-rc5-at91/drivers/input/keyboard/gpio_keys.c	2007-09-18 16:59:23.000000000 +0300
@@ -77,10 +77,12 @@ static int __devinit gpio_keys_probe(str
 		int irq = gpio_to_irq(button->gpio);
 		unsigned int type = button->type ?: EV_KEY;
 
-		set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
-		error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM,
-				     button->desc ? button->desc : "gpio_keys",
-				     pdev);
+		if (irq < 0)
+			goto fail;
+
+		error = request_irq(irq, gpio_keys_isr, 
+				     IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
+				     button->desc ? button->desc : "gpio_keys", pdev);
 		if (error) {
 			printk(KERN_ERR "gpio-keys: unable to claim irq %d; error %d\n",
 				irq, error);



-- 
Anti Sullin
Embedded Software Engineer
Artec Design LLC
Türi 10C, 11313, Tallinn, Estonia

Re: [PATCH 1/2] gpio_keys: add gpio_to_irq return code check

[Dmitry Torokhov]

Hi Anti,

On 9/18/07, Anti Sullin <anti.sullin@artecdesign.ee> wrote:
> As David Brownell pointed out when reviewing my suspend patch to
> gpio_keys, the original gpio_keys driver does not check gpio_to_irq
> return code.
>
...
> -               set_irq_type(irq, IRQ_TYPE_EDGE_BOTH);
> -               error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM,
> -                                    button->desc ? button->desc : "gpio_keys",
> -                                    pdev);
> +               if (irq < 0)

What would be the value of error variable (that we use as a return value) here?

> +                       goto fail;
> +

-- 
Dmitry