Commit 25c9b7bd authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Dmitry Torokhov

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent f0886a66
...@@ -125,7 +125,7 @@ static int ixp4xx_spkr_probe(struct platform_device *dev) ...@@ -125,7 +125,7 @@ static int ixp4xx_spkr_probe(struct platform_device *dev)
return 0; return 0;
err_free_irq: err_free_irq:
free_irq(IRQ_IXP4XX_TIMER2, dev); free_irq(IRQ_IXP4XX_TIMER2, (void *)dev->id);
err_free_device: err_free_device:
input_free_device(input_dev); input_free_device(input_dev);
...@@ -144,7 +144,7 @@ static int ixp4xx_spkr_remove(struct platform_device *dev) ...@@ -144,7 +144,7 @@ static int ixp4xx_spkr_remove(struct platform_device *dev)
disable_irq(IRQ_IXP4XX_TIMER2); disable_irq(IRQ_IXP4XX_TIMER2);
ixp4xx_spkr_control(pin, 0); ixp4xx_spkr_control(pin, 0);
free_irq(IRQ_IXP4XX_TIMER2, dev); free_irq(IRQ_IXP4XX_TIMER2, (void *)dev->id);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment