aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-05-23 12:30:15 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-05-23 12:38:35 -0400
commit25c9b7bd332584724fb2bb9031377903159537d3 (patch)
tree2a2baebc2bd2555b92da53fe3f0ef379e782856f
parentf0886a66295ccd9c81eb0cceb596e5fbc19dc2ac (diff)
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>
-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)
125 return 0; 125 return 0;
126 126
127 err_free_irq: 127 err_free_irq:
128 free_irq(IRQ_IXP4XX_TIMER2, dev); 128 free_irq(IRQ_IXP4XX_TIMER2, (void *)dev->id);
129 err_free_device: 129 err_free_device:
130 input_free_device(input_dev); 130 input_free_device(input_dev);
131 131
@@ -144,7 +144,7 @@ static int ixp4xx_spkr_remove(struct platform_device *dev)
144 disable_irq(IRQ_IXP4XX_TIMER2); 144 disable_irq(IRQ_IXP4XX_TIMER2);
145 ixp4xx_spkr_control(pin, 0); 145 ixp4xx_spkr_control(pin, 0);
146 146
147 free_irq(IRQ_IXP4XX_TIMER2, dev); 147 free_irq(IRQ_IXP4XX_TIMER2, (void *)dev->id);
148 148
149 return 0; 149 return 0;
150} 150}