From: Jonathan Cameron Date: Fri, 12 Aug 2011 15:55:28 +0000 (+0100) Subject: staging:iio:gyro:adis16130 fix adis16130_spi_read which was never selecting the channel X-Git-Tag: MMI-PSA29.97-13-9~18234^2^2~864^2~259 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cdf6e817904412931ba9a54fa0376cf6f4f678fe;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging:iio:gyro:adis16130 fix adis16130_spi_read which was never selecting the channel Signed-off-by: Jonathan Cameron Acked-by: Michael Hennerich Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c index c80e908d8acf..caf067ce98ce 100644 --- a/drivers/staging/iio/gyro/adis16130_core.c +++ b/drivers/staging/iio/gyro/adis16130_core.c @@ -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) |