Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 152d52cf authored by Bryan Freed's avatar Bryan Freed Committed by Greg Kroah-Hartman
Browse files

staging:iio:light:isl29018: Fix the "Init of isl29018 fails" failure. 



The I2C clientdata is set to indio_dev instead of chip as of a couple weeks ago.
Correct the calls to i2c_get_clientdata() accordingly.
Otherwise the driver fails to initialize.

Signed-off-by: default avatarBryan Freed <bfreed@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6e882d47

drivers/staging/iio/light/isl29018.c

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int isl29018_write_data(struct i2c_client *client, u8 reg, 
{

	u8 regval;

	int ret = 0;

	struct isl29018_chip *chip = i2c_get_clientdata(client);

	struct isl29018_chip *chip = iio_priv(i2c_get_clientdata(client));



	regval = chip->reg_cache[reg];

	regval &= ~mask;
@@ -158,7 +158,7 @@ static int isl29018_read_sensor_input(struct i2c_client *client, int mode) 
static int isl29018_read_lux(struct i2c_client *client, int *lux)

{

	int lux_data;

	struct isl29018_chip *chip = i2c_get_clientdata(client);

	struct isl29018_chip *chip = iio_priv(i2c_get_clientdata(client));



	lux_data = isl29018_read_sensor_input(client,

				COMMMAND1_OPMODE_ALS_ONCE);
@@ -466,7 +466,7 @@ static const struct attribute_group isl29108_group = { 


static int isl29018_chip_init(struct i2c_client *client)

{

	struct isl29018_chip *chip = i2c_get_clientdata(client);

	struct isl29018_chip *chip = iio_priv(i2c_get_clientdata(client));

	int status;

	int new_adc_bit;

	unsigned int new_range;