From d291d5f692f3fe90de08cea3f1c14ebd80da89ce Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen
Date: Fri, 13 Jul 2012 13:04:00 +0100
Subject: staging:iio:tsl2x7x: Ensure request_irq and free_irq dev_id parameter
match
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:
//
@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(...)
//
Cc: Jon Brenner
Signed-off-by: Lars-Peter Clausen
Signed-off-by: Jonathan Cameron
---
drivers/staging/iio/light/tsl2x7x_core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
(limited to 'drivers/staging/iio/light')
diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c
index 7944686057cc..497a977ae411 100644
--- a/drivers/staging/iio/light/tsl2x7x_core.c
+++ b/drivers/staging/iio/light/tsl2x7x_core.c
@@ -2029,13 +2029,12 @@ static int tsl2x7x_resume(struct device *dev)
static int __devexit tsl2x7x_remove(struct i2c_client *client)
{
struct iio_dev *indio_dev = i2c_get_clientdata(client);
- struct tsl2X7X_chip *chip = iio_priv(indio_dev);
tsl2x7x_chip_off(indio_dev);
iio_device_unregister(indio_dev);
if (client->irq)
- free_irq(client->irq, chip->client->name);
+ free_irq(client->irq, indio_dev);
iio_device_free(indio_dev);
--
cgit v1.2.3-55-g7522