Commit 75552ee5 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

Revert "iio:humidity:si7020: fix pointer to i2c client"

commit e765537a upstream.

This reverts commit e0922e5e.
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: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dc77d1f2
...@@ -45,12 +45,12 @@ static int si7020_read_raw(struct iio_dev *indio_dev, ...@@ -45,12 +45,12 @@ static int si7020_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan, int *val, struct iio_chan_spec const *chan, int *val,
int *val2, long mask) int *val2, long mask)
{ {
struct i2c_client *client = iio_priv(indio_dev); struct i2c_client **client = iio_priv(indio_dev);
int ret; int ret;
switch (mask) { switch (mask) {
case IIO_CHAN_INFO_RAW: case IIO_CHAN_INFO_RAW:
ret = i2c_smbus_read_word_data(client, ret = i2c_smbus_read_word_data(*client,
chan->type == IIO_TEMP ? chan->type == IIO_TEMP ?
SI7020CMD_TEMP_HOLD : SI7020CMD_TEMP_HOLD :
SI7020CMD_RH_HOLD); SI7020CMD_RH_HOLD);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment