diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-04-28 00:39:57 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-04-28 02:11:26 -0400 |
commit | 60c8ba6478bb483ecd6069f566d02e33d319e72e (patch) | |
tree | b2b1dcd47197c19cd19e8d718711d4cb02e2a4a5 /drivers/input/keyboard | |
parent | 94bb530c247a29f75fc728e5f8374a83d59d7e45 (diff) |
Input: omap-keypad - fix a wrong free_irq() parameter
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>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r-- | drivers/input/keyboard/omap-keypad.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 0e2a19cb43d8..f23a743817db 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
@@ -413,7 +413,7 @@ static int __devinit omap_kp_probe(struct platform_device *pdev) | |||
413 | return 0; | 413 | return 0; |
414 | err5: | 414 | err5: |
415 | for (i = irq_idx - 1; i >=0; i--) | 415 | for (i = irq_idx - 1; i >=0; i--) |
416 | free_irq(row_gpios[i], NULL); | 416 | free_irq(row_gpios[i], omap_kp); |
417 | err4: | 417 | err4: |
418 | input_unregister_device(omap_kp->input); | 418 | input_unregister_device(omap_kp->input); |
419 | input_dev = NULL; | 419 | input_dev = NULL; |
@@ -444,11 +444,11 @@ static int __devexit omap_kp_remove(struct platform_device *pdev) | |||
444 | gpio_free(col_gpios[i]); | 444 | gpio_free(col_gpios[i]); |
445 | for (i = 0; i < omap_kp->rows; i++) { | 445 | for (i = 0; i < omap_kp->rows; i++) { |
446 | gpio_free(row_gpios[i]); | 446 | gpio_free(row_gpios[i]); |
447 | free_irq(gpio_to_irq(row_gpios[i]), NULL); | 447 | free_irq(gpio_to_irq(row_gpios[i]), omap_kp); |
448 | } | 448 | } |
449 | } else { | 449 | } else { |
450 | omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); | 450 | omap_writew(1, OMAP1_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT); |
451 | free_irq(omap_kp->irq, NULL); | 451 | free_irq(omap_kp->irq, omap_kp); |
452 | } | 452 | } |
453 | 453 | ||
454 | del_timer_sync(&omap_kp->timer); | 454 | del_timer_sync(&omap_kp->timer); |