Skip to content

Commit

Permalink
staging:iio:light:isl29018: Fix the "Init of isl29018 fails" failure.
Browse files Browse the repository at this point in the history
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: Bryan Freed <bfreed@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bryan Freed authored and Greg Kroah-Hartman committed Jul 8, 2011
1 parent 6e882d4 commit 152d52c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/staging/iio/light/isl29018.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 152d52c

Please sign in to comment.