Skip to content

Commit

Permalink
Input: pxa27x_keypad - pass correct pointer to free_irq()
Browse files Browse the repository at this point in the history
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>

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
  • Loading branch information
Lars-Peter Clausen authored and Dmitry Torokhov committed May 23, 2013
1 parent d7ecfff commit 8c7f5f5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/input/keyboard/pxa27x_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ static int pxa27x_keypad_probe(struct platform_device *pdev)
return 0;

failed_free_irq:
free_irq(irq, pdev);
free_irq(irq, keypad);
failed_put_clk:
clk_put(keypad->clk);
failed_free_io:
Expand All @@ -600,7 +600,7 @@ static int pxa27x_keypad_remove(struct platform_device *pdev)
struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
struct resource *res;

free_irq(keypad->irq, pdev);
free_irq(keypad->irq, keypad);
clk_put(keypad->clk);

input_unregister_device(keypad->input_dev);
Expand Down

0 comments on commit 8c7f5f5

Please sign in to comment.