| Message ID | 1369061486-28226-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Monday, May 20, 2013 7:51 AM, Lars-Peter Clausen wrote: > free_irq() expects the same pointer that was passed to request_irq(), otherwise > the IRQ is not freed. <snip> > Cc: H Hartley Sweeten <hartleys@visionengravers.com> > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > drivers/input/keyboard/ep93xx_keypad.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks, Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, May 20, 2013 at 10:49:00AM -0500, H Hartley Sweeten wrote: > On Monday, May 20, 2013 7:51 AM, Lars-Peter Clausen wrote: > > free_irq() expects the same pointer that was passed to request_irq(), otherwise > > the IRQ is not freed. > > <snip> > > > Cc: H Hartley Sweeten <hartleys@visionengravers.com> > > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > > --- > > drivers/input/keyboard/ep93xx_keypad.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > Thanks, > > Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> > Applied all, thank you.
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c index a8d5aac..47206bd 100644 --- a/drivers/input/keyboard/ep93xx_keypad.c +++ b/drivers/input/keyboard/ep93xx_keypad.c @@ -329,7 +329,7 @@ static int ep93xx_keypad_probe(struct platform_device *pdev) return 0; failed_free_irq: - free_irq(keypad->irq, pdev); + free_irq(keypad->irq, keypad); failed_free_dev: input_free_device(input_dev); failed_put_clk: @@ -350,7 +350,7 @@ static int ep93xx_keypad_remove(struct platform_device *pdev) struct ep93xx_keypad *keypad = platform_get_drvdata(pdev); struct resource *res; - free_irq(keypad->irq, pdev); + free_irq(keypad->irq, keypad); if (keypad->enabled) clk_disable(keypad->clk);
free_irq() expects the same pointer that was passed to request_irq(), otherwise the IRQ is not freed. The issue was found using the following coccinelle script: <smpl> @r1@ type T; T devid; @@ request_irq(..., devid) @r2@ type r1.T; T devid; position p; @@ free_irq@p(..., devid) @@ position p != r2.p; @@ *free_irq@p(...) </smpl> Cc: H Hartley Sweeten <hartleys@visionengravers.com> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- drivers/input/keyboard/ep93xx_keypad.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)