Re: [PATCH 4/6] staging:iio:accel:sca3000: Channels missing in temp_output case

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 





On 13/01/14 21:28, Peter Meerwald wrote:
issues introduced here 25888dc5,
staging:iio:sca3000 extract old event handling and move to poll for events

Ouch
Signed-off-by: Peter Meerwald <pmeerw@xxxxxxxxxx>
Applied to the togreg branch of iio.git

---
  drivers/staging/iio/accel/sca3000_core.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 159272e..0123bc0 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);

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux