staging:iio:sca3000: Register same channels for device and buffer
authorLars-Peter Clausen <lars@metafoo.de>
Wed, 26 Nov 2014 17:55:10 +0000 (18:55 +0100)
committerJonathan Cameron <jic23@kernel.org>
Fri, 12 Dec 2014 12:28:30 +0000 (12:28 +0000)
In preparation for moving the buffer registration to the core make sure to
register the same channel array for the device and the buffer. Currently
the temperature channel is not registered for the buffer, setting its scan
index to -1 will make sure that it is skipped for the buffer.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/staging/iio/accel/sca3000_core.c

index cd46a616043b2f7db6f77be08a53635496de4fac..aef8c916e07bf2b10d85057b275c78b7cb7c67e5 100644 (file)
@@ -459,6 +459,8 @@ static const struct iio_chan_spec sca3000_channels_with_temp[] = {
                .info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
                .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) |
                        BIT(IIO_CHAN_INFO_OFFSET),
+               /* No buffer support */
+               .scan_index = -1,
        },
 };
 
@@ -1154,9 +1156,8 @@ static int sca3000_probe(struct spi_device *spi)
        if (ret < 0)
                return ret;
 
-       ret = iio_buffer_register(indio_dev,
-                                 sca3000_channels,
-                                 ARRAY_SIZE(sca3000_channels));
+       ret = iio_buffer_register(indio_dev, indio_dev->channels,
+                                 indio_dev->num_channels);
        if (ret < 0)
                goto error_unregister_dev;