Skip to content

Commit

Permalink
staging:iio:tsl2x7x: Ensure request_irq and free_irq dev_id parameter…
Browse files Browse the repository at this point in the history
… 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:

// <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: Jon Brenner <jbrenner@taosinc.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Lars-Peter Clausen authored and Jonathan Cameron committed Jul 14, 2012
1 parent 165d0c5 commit d291d5f
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/staging/iio/light/tsl2x7x_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit d291d5f

Please sign in to comment.