summaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-05-23 09:30:15 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-05-23 09:38:35 -0700
commit25c9b7bd332584724fb2bb9031377903159537d3 (patch)
tree2a2baebc2bd2555b92da53fe3f0ef379e782856f /drivers/input/misc
parentf0886a66295ccd9c81eb0cceb596e5fbc19dc2ac (diff)
downloadtalos-obmc-linux-25c9b7bd332584724fb2bb9031377903159537d3.tar.gz
talos-obmc-linux-25c9b7bd332584724fb2bb9031377903159537d3.zip
Input: ixp4xx-beeper - pass correct pointer to free_irq()
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>
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/ixp4xx-beeper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/ixp4xx-beeper.c b/drivers/input/misc/ixp4xx-beeper.c
index 6ab3decc86e6..deab4a11350a 100644
--- a/drivers/input/misc/ixp4xx-beeper.c
+++ b/drivers/input/misc/ixp4xx-beeper.c
@@ -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);
@@ -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;
}
OpenPOWER on IntegriCloud