staging:iio:gyro:adis16130 fix adis16130_spi_read which was never selecting the channel
authorJonathan Cameron <jic23@cam.ac.uk>
Fri, 12 Aug 2011 15:55:28 +0000 (16:55 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 23 Aug 2011 20:28:42 +0000 (13:28 -0700)
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/iio/gyro/adis16130_core.c

index c80e908d8acf8e53a50c45fd87c9c44a98fb0d9c..caf067ce98ce6e5da06a9ed33555431d25a8c773 100644 (file)
@@ -75,15 +75,24 @@ static int adis16130_spi_read(struct device *dev, u8 reg_addr,
        int ret;
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
        struct adis16130_state *st = iio_priv(indio_dev);
+       struct spi_message msg;
+       struct spi_transfer xfer = {
+               .tx_buf = st->buf,
+               .rx_buf = st->buf,
+       };
 
        mutex_lock(&st->buf_lock);
 
        st->buf[0] = ADIS16130_CON_RD | reg_addr;
+       st->buf[1] = st->buf[2] = st->buf[3] = 0;
+
        if (st->mode)
-               ret = spi_read(st->us, st->buf, 4);
+               xfer.len = 4;
        else
-               ret = spi_read(st->us, st->buf, 3);
-
+               xfer.len = 3;
+       spi_message_init(&msg);
+       spi_message_add_tail(&xfer, &msg);
+       ret = spi_sync(st->us, &msg);
        if (ret == 0) {
                if (st->mode)
                        *val = (st->buf[1] << 16) |