hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input: gpio_keys - verify that supplied GPIO numbers are valid 

As David Brownell pointed out, gpio_keys driver does not check
return code of gpio_to_irq().

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>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Anti Sullin 2007-09-26 00:01:03 -04:00 committed by Dmitry Torokhov
parent 2a8281d72d
commit 006df30244
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/input/keyboard/gpio_keys.c
View File

@ -78,12 +78,24 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
int irq = gpio_to_irq(button->gpio); int irq = gpio_to_irq(button->gpio);
unsigned int type = button->type ?: EV_KEY; unsigned int type = button->type ?: EV_KEY;
set_irq_type(irq, IRQ_TYPE_EDGE_BOTH); if (irq < 0) {
error = request_irq(irq, gpio_keys_isr, IRQF_SAMPLE_RANDOM, error = irq;
button->desc ? button->desc : "gpio_keys", printk(KERN_ERR
pdev); "gpio-keys: "
"Unable to get irq number for GPIO %d,"
"error %d\n",
button->gpio, error);
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) { if (error) {
printk(KERN_ERR "gpio-keys: unable to claim irq %d; error %d\n", printk(KERN_ERR
"gpio-keys: Unable to claim irq %d; error %d\n",
irq, error); irq, error);
goto fail; goto fail;
} }
@ -93,16 +105,19 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
error = input_register_device(input); error = input_register_device(input);
if (error) { if (error) {
printk(KERN_ERR "Unable to register gpio-keys input device\n"); printk(KERN_ERR
"gpio-keys: Unable to register input device, "
"error: %d\n", error);
goto fail; goto fail;
} }
return 0; return 0;
fail: fail:
for (i = i - 1; i >= 0; i--) while (--i >= 0)
free_irq(gpio_to_irq(pdata->buttons[i].gpio), pdev); free_irq(gpio_to_irq(pdata->buttons[i].gpio), pdev);
platform_set_drvdata(pdev, NULL);
input_free_device(input); input_free_device(input);
return error; return error;