From: Lars-Peter Clausen Date: Mon, 10 Jun 2013 14:00:00 +0000 (+0100) Subject: staging:iio:adis16130: Fix sample reading X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=19155762f189b3f3e46a9284752857989eb2c7e2;p=linux-beck.git staging:iio:adis16130: Fix sample reading The driver first does a proper read of the data register, but right after that it does a spi_read, which will overwrite the initial result. It looks as if the extra spi_read was accidentally introduced in commit a5e7363ca ("staging:iio:gyro:adis16130 drop control of adc resolution."), quite likely due to a bad rebase. Signed-off-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron --- diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c index 528863540796..2537f59f5425 100644 --- a/drivers/staging/iio/gyro/adis16130_core.c +++ b/drivers/staging/iio/gyro/adis16130_core.c @@ -62,7 +62,6 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val) spi_message_init(&msg); spi_message_add_tail(&xfer, &msg); ret = spi_sync(st->us, &msg); - ret = spi_read(st->us, st->buf, 4); if (ret == 0) *val = (st->buf[1] << 16) | (st->buf[2] << 8) | st->buf[3];