* [PATCH] Input: omap-keypad - fix a wrong free_irq() parameter
@ 2011-04-28 3:23 Axel Lin
2011-04-28 6:26 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2011-04-28 3:23 UTC (permalink / raw)
To: linux-kernel; +Cc: Timo Teräs, Dmitry Torokhov, Tony Lindgren, linux-input
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>
---
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);
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Input: omap-keypad - fix a wrong free_irq() parameter
2011-04-28 3:23 [PATCH] Input: omap-keypad - fix a wrong free_irq() parameter Axel Lin
@ 2011-04-28 6:26 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2011-04-28 6:26 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Timo Teräs, Tony Lindgren, linux-input
On Thu, Apr 28, 2011 at 11:23:26AM +0800, Axel Lin wrote:
> In current implementation, free_irq() was using NULL rather than the
> driver data as the data pointer so free_irq() wouldn't have matched.
>
Applied, thanks Axel.
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-28 6:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-28 3:23 [PATCH] Input: omap-keypad - fix a wrong free_irq() parameter Axel Lin
2011-04-28 6:26 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).