Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 260041
b: refs/heads/master
c: 152d52c
h: refs/heads/master
i:
  260039: f5f9ca8
v: v3
  • Loading branch information
Bryan Freed authored and Greg Kroah-Hartman committed Jul 8, 2011
1 parent d1d51b1 commit e518800
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6e882d472f2b9fdfa4838317c9b67a64403fef73
refs/heads/master: 152d52cf7ec18e655a2d5bb6a79d42e6e09d92d7
6 changes: 3 additions & 3 deletions trunk/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 e518800

Please sign in to comment.