FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-03 17:44:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Input: omap-keypad - fix a wrong free_irq() parameter

Browse Source 
In current implementation, free_irq() was using NULL rather than the
driver data as the data pointer so free_irq() wouldn't have matched.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Axel Lin 2011-04-27 21:39:57 -07:00 committed by Dmitry Torokhov
parent 94bb530c24
commit 60c8ba6478
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/keyboard/omap-keypad.c
View File

@ -413,7 +413,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev)
return 0; return 0;
err5: err5:
for (i = irq_idx - 1; i >=0; i--) for (i = irq_idx - 1; i >=0; i--)
free_irq(row_gpios[i], NULL); free_irq(row_gpios[i], omap_kp);
err4: err4:
input_unregister_device(omap_kp->input); input_unregister_device(omap_kp->input);
input_dev = NULL; input_dev = NULL;
@ -444,11 +444,11 @@ static int __devexit omap_kp_remove(struct platform_device *pdev)
gpio_free(col_gpios[i]); gpio_free(col_gpios[i]);
for (i = 0; i < omap_kp->rows; i++) { for (i = 0; i < omap_kp->rows; i++) {
gpio_free(row_gpios[i]); gpio_free(row_gpios[i]);
free_irq(gpio_to_irq(row_gpios[i]), NULL); free_irq(gpio_to_irq(row_gpios[i]), omap_kp);
} }
} else { } else {
omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
free_irq(omap_kp->irq, NULL); free_irq(omap_kp->irq, omap_kp);
} }
del_timer_sync(&omap_kp->timer); del_timer_sync(&omap_kp->timer);