]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging:iio:tsl2x7x: Fix client data inconsistency
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:56 +0000 (09:42 +0100)
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>
drivers/staging/iio/light/tsl2x7x_core.c

index fdf75e45428cc8269bcbbd80441b1cb34223c261..7944686057ccd9e042fef1c613e9756cd7f634e1 100644 (file)
@@ -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);