]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging:iio:lpc32xx_adc: Ensure request_irq and free_irq dev_id parameter match
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 13 Jul 2012 12:04:00 +0000 (13:04 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sat, 14 Jul 2012 08:42:57 +0000 (09:42 +0100)
The data parameters for request_irq and free_irq have to match, otherwise the
IRQ wont be freed.

The issue has been discovered using the following coccinelle patch:

// <smpl>
@r1@
type T;
T data;
@@
(
request_irq(..., (void *)data)
|
request_irq(..., data)
|
request_threaded_irq(..., (void *)data)
|
request_threaded_irq(..., data)
)

@r2@
type r1.T;
T data;
position p;
@@
(
free_irq@p(..., (void *)data)
|
free_irq@p(..., data)
)

@depends on r1@
position p != r2.p;
@@
*free_irq@p(...)

// </smpl>

Cc: Roland Stigge <stigge@antcom.de>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/staging/iio/adc/lpc32xx_adc.c

index 9690306d1f8f21b2eb85ea3518e6cbe81f43990d..348d051fc2f8a567ec26c113fcc3eda668cb9c6d 100644 (file)
@@ -196,7 +196,7 @@ static int __devinit lpc32xx_adc_probe(struct platform_device *pdev)
        return 0;
 
 errout5:
-       free_irq(irq, iodev);
+       free_irq(irq, info);
 errout4:
        clk_put(info->clk);
 errout3:
@@ -214,7 +214,7 @@ static int __devexit lpc32xx_adc_remove(struct platform_device *pdev)
        int irq = platform_get_irq(pdev, 0);
 
        iio_device_unregister(iodev);
-       free_irq(irq, iodev);
+       free_irq(irq, info);
        platform_set_drvdata(pdev, NULL);
        clk_put(info->clk);
        iounmap(info->adc_base);