Skip to content

Commit

Permalink
Input: ixp4xx-beeper - 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 f0886a6 commit 25c9b7b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/input/misc/ixp4xx-beeper.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ static int ixp4xx_spkr_probe(struct platform_device *dev)
return 0;

err_free_irq:
free_irq(IRQ_IXP4XX_TIMER2, dev);
free_irq(IRQ_IXP4XX_TIMER2, (void *)dev->id);
err_free_device:
input_free_device(input_dev);

Expand All @@ -144,7 +144,7 @@ static int ixp4xx_spkr_remove(struct platform_device *dev)
disable_irq(IRQ_IXP4XX_TIMER2);
ixp4xx_spkr_control(pin, 0);

free_irq(IRQ_IXP4XX_TIMER2, dev);
free_irq(IRQ_IXP4XX_TIMER2, (void *)dev->id);

return 0;
}
Expand Down

0 comments on commit 25c9b7b

Please sign in to comment.