diff options
author | Jonathan Cameron <jic23@kernel.org> | 2015-02-14 11:32:17 +0000 |
---|---|---|
committer | Jonathan Cameron <jic23@kernel.org> | 2015-02-14 11:32:17 +0000 |
commit | e765537add38cf7967efa11999bb5daf84a6517d (patch) | |
tree | 6c4bfc14d61ae8c60e880f286bc5a5825526d50a /drivers/iio/humidity | |
parent | 8c3b3efb32e0fc5dc3c0a81c7f7639a14bebdb78 (diff) | |
download | op-kernel-dev-e765537add38cf7967efa11999bb5daf84a6517d.zip op-kernel-dev-e765537add38cf7967efa11999bb5daf84a6517d.tar.gz |
Revert "iio:humidity:si7020: fix pointer to i2c client"
This reverts commit e0922e5e3ccb78aa0152e93dfbd1755ac39c8582.
Requested by Andrey Smirnov.
It incorrectly assumes that the level of indirection is not needed
which is not true(probably because the driver incorrectly allocates
sizeof(*client) instead of sizeof(*data) via devm_iio_device_alloc).
If you look at the code of the probe function(see below) it is easy to
see that what is being stored in the private memory of the IIO device
instance is not a copy of a 'struct i2c_client' but a pointer to an
instance passed as an argument to the probe function.
struct i2c_client **data;
int ret;
< Some code skipped >
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*client));
if (!indio_dev)
return -ENOMEM;
data = iio_priv(indio_dev);
*data = client;
Without reverting this change any read of a raw value of this sensor
leads to a kernel oops due to a NULL pointer de-reference on my
hardware setup.
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Cc: Stable@vger.kernel.org
Diffstat (limited to 'drivers/iio/humidity')
-rw-r--r-- | drivers/iio/humidity/si7020.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/humidity/si7020.c b/drivers/iio/humidity/si7020.c index b541646..69e49f5 100644 --- a/drivers/iio/humidity/si7020.c +++ b/drivers/iio/humidity/si7020.c @@ -45,12 +45,12 @@ static int si7020_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) { - struct i2c_client *client = iio_priv(indio_dev); + struct i2c_client **client = iio_priv(indio_dev); int ret; switch (mask) { case IIO_CHAN_INFO_RAW: - ret = i2c_smbus_read_word_data(client, + ret = i2c_smbus_read_word_data(*client, chan->type == IIO_TEMP ? SI7020CMD_TEMP_HOLD : SI7020CMD_RH_HOLD); |