summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2014-01-13 21:28:00 +0000
committerJonathan Cameron <jic23@kernel.org>2014-01-18 11:10:11 +0000
commit735165a8ee2ba5de723f014f4d6e77f99a51df62 (patch)
treef4778f6970c1f66f2421867dad53879aae883be1 /drivers/staging/iio
parent84bb9cdd035ee6ed63371ae926ed225ba51770f2 (diff)
downloadlinux-735165a8ee2ba5de723f014f4d6e77f99a51df62.tar.gz
linux-735165a8ee2ba5de723f014f4d6e77f99a51df62.tar.bz2
linux-735165a8ee2ba5de723f014f4d6e77f99a51df62.zip
staging:iio:accel:sca3000: Channels missing in temp_output case
issues introduced here 25888dc5, staging:iio:sca3000 extract old event handling and move to poll for events Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r--drivers/staging/iio/accel/sca3000_core.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 159272e9de9e..0123bc0f2922 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -1170,11 +1170,10 @@ static int sca3000_probe(struct spi_device *spi)
indio_dev->name = spi_get_device_id(spi)->name;
if (st->info->temp_output)
indio_dev->info = &sca3000_info_with_temp;
- else {
+ else
indio_dev->info = &sca3000_info;
- indio_dev->channels = sca3000_channels;
- indio_dev->num_channels = ARRAY_SIZE(sca3000_channels);
- }
+ indio_dev->channels = sca3000_channels;
+ indio_dev->num_channels = ARRAY_SIZE(sca3000_channels);
indio_dev->modes = INDIO_DIRECT_MODE;
sca3000_configure_ring(indio_dev);