Input: ixp4xx-beeper - pass correct pointer to free_irq()
authorLars-Peter Clausen <lars@metafoo.de>
Thu, 23 May 2013 16:30:15 +0000 (09:30 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 23 May 2013 16:38:35 +0000 (09:38 -0700)
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>
drivers/input/misc/ixp4xx-beeper.c

index 6ab3decc86e6f15ce11fca3c3d0da3355aa66ef7..deab4a11350a4ee33bfebe459fbe7fedcd70e48a 100644 (file)
@@ -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;
 }