diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-26 00:41:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-26 00:41:21 +0100 |
| commit | ae1d3b974e091b5fc9008bd41bcbdaac68110b62 (patch) | |
| tree | 82e50a66925ced79f59ed4504f6e073ef55edee3 /drivers/input/keyboard/omap-keypad.c | |
| parent | 586893ebc42943008010b4c210cfc9167df615e5 (diff) | |
| parent | 7a2207a0e1142a9b214b323e43ab2ecc592e5b0e (diff) | |
| download | kernel_samsung_tuna-ae1d3b974e091b5fc9008bd41bcbdaac68110b62.zip kernel_samsung_tuna-ae1d3b974e091b5fc9008bd41bcbdaac68110b62.tar.gz kernel_samsung_tuna-ae1d3b974e091b5fc9008bd41bcbdaac68110b62.tar.bz2 | |
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'drivers/input/keyboard/omap-keypad.c')
| -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 0e2a19c..f23a743 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) return 0; err5: for (i = irq_idx - 1; i >=0; i--) - free_irq(row_gpios[i], NULL); + free_irq(row_gpios[i], omap_kp); err4: input_unregister_device(omap_kp->input); input_dev = NULL; @@ -444,11 +444,11 @@ static int __devexit omap_kp_remove(struct platform_device *pdev) gpio_free(col_gpios[i]); for (i = 0; i < omap_kp->rows; 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 { 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); |