Skip to content

Commit

Permalink
staging:iio:tsl2x7x: Fix client data inconsistency
Browse files Browse the repository at this point in the history
In probe the I2C client data is set to the iio_dev struct in probe(), but
assumed to be the tsl2X7X_chip struct in remove(). Fix this by reading the
client data back as iio_dev as well.

The issue has been discovered using the following coccinelle patch:

// <smpl>
@r1@
type T;
T data;
expression dev;
@@
(
i2c_set_clientdata(dev, (void *)data)
|
i2c_set_clientdata(dev, data)
)

@r2@
type r1.T;
T data;
position p;
expression dev;
@@
data = i2c_get_clientdata@p(dev)

@depends on r1@
position p != r2.p;
expression dev;
identifier data;
@@
*data = i2c_get_clientdata@p(dev)
// </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 97271c3 commit 79d2a6b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/iio/light/tsl2x7x_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -2028,8 +2028,8 @@ static int tsl2x7x_resume(struct device *dev)

static int __devexit tsl2x7x_remove(struct i2c_client *client)
{
struct tsl2X7X_chip *chip = i2c_get_clientdata(client);
struct iio_dev *indio_dev = iio_priv_to_dev(chip);
struct iio_dev *indio_dev = i2c_get_clientdata(client);
struct tsl2X7X_chip *chip = iio_priv(indio_dev);

tsl2x7x_chip_off(indio_dev);

Expand Down

0 comments on commit 79d2a6b

Please sign in to comment.