From e518800f320204108961f70eb005023a8816a719 Mon Sep 17 00:00:00 2001 From: Bryan Freed Date: Thu, 7 Jul 2011 12:01:57 -0700 Subject: [PATCH] --- yaml --- r: 260041 b: refs/heads/master c: 152d52cf7ec18e655a2d5bb6a79d42e6e09d92d7 h: refs/heads/master i: 260039: f5f9ca8745ab9cd14e97daf72b30067d7398b31c v: v3 --- [refs] | 2 +- trunk/drivers/staging/iio/light/isl29018.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 25add7f52a28..f02933b01d4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6e882d472f2b9fdfa4838317c9b67a64403fef73 +refs/heads/master: 152d52cf7ec18e655a2d5bb6a79d42e6e09d92d7 diff --git a/trunk/drivers/staging/iio/light/isl29018.c b/trunk/drivers/staging/iio/light/isl29018.c index cc6d71837e18..1e751459fbb5 100644 --- a/trunk/drivers/staging/iio/light/isl29018.c +++ b/trunk/drivers/staging/iio/light/isl29018.c @@ -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;