Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268179
b: refs/heads/master
c: 4050f49
h: refs/heads/master
i:
  268177: 926f0e8
  268175: 9a92cb2
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent da62c8e commit a3aca12
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 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: 3995f917827a523e8b0681b83e9260862659f5c9
refs/heads/master: 4050f493996b3fbebe4ee0db4a16083d67d6e85b
6 changes: 5 additions & 1 deletion trunk/drivers/staging/iio/adc/ad7152.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,10 @@ static int __devinit ad7152_probe(struct i2c_client *client,
indio_dev->dev.parent = &client->dev;
indio_dev->info = &ad7152_info;
indio_dev->channels = ad7152_channels;
if (id->driver_data == 0)
indio_dev->num_channels = ARRAY_SIZE(ad7152_channels);
else
indio_dev->num_channels = 1;
indio_dev->num_channels = ARRAY_SIZE(ad7152_channels);
indio_dev->modes = INDIO_DIRECT_MODE;

Expand Down Expand Up @@ -430,7 +434,7 @@ static int __devexit ad7152_remove(struct i2c_client *client)

static const struct i2c_device_id ad7152_id[] = {
{ "ad7152", 0 },
{ "ad7153", 0 },
{ "ad7153", 1 },
{}
};

Expand Down

0 comments on commit a3aca12

Please sign in to comment.