diff --git a/[refs] b/[refs] index d86ba96acc59..8e042b38c81c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3995f917827a523e8b0681b83e9260862659f5c9 +refs/heads/master: 4050f493996b3fbebe4ee0db4a16083d67d6e85b diff --git a/trunk/drivers/staging/iio/adc/ad7152.c b/trunk/drivers/staging/iio/adc/ad7152.c index ed8fdc6b7e30..1ec012dfacc1 100644 --- a/trunk/drivers/staging/iio/adc/ad7152.c +++ b/trunk/drivers/staging/iio/adc/ad7152.c @@ -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; @@ -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 }, {} };