patch "iio: accel: kxsd9: fix the usage of spi_w8r8()" added to staging-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
iio: accel: kxsd9: fix the usage of spi_w8r8()
to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
0c1f91b98552da49d9d8eed32b3132a58d2f4598Mon Sep 17 00:00:00 2001
From: Linus Walleij <[email protected]>
Date: Fri, 17 Jun 2016 15:22:24 +0200
Subject: iio: accel: kxsd9: fix the usage of spi_w8r8()
These two spi_w8r8() calls return a value with is used by the code following the error check. The dubious use was caused by a cleanup patch.
--- drivers/iio/accel/kxsd9.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/accel/kxsd9.c +2 -2
@@ -81,7 +81,7 @@ static int kxsd9_write_scale(struct iio_dev *indio_dev, int micro)mutex_lock (&st->buf_lock); ret =spi_w8r8 (st->us,KXSD9_READ (KXSD9_REG_CTRL_C )); -if (ret) +if (ret <0 ) goto error_ret; st->tx[0 ] =KXSD9_WRITE (KXSD9_REG_CTRL_C ); st->tx[1 ] = (ret & ~KXSD9_FS_MASK ) | i;
@@ -163,7 +163,7 @@ static int kxsd9_read_raw(struct iio_dev *indio_dev,break ;case IIO_CHAN_INFO_SCALE : ret =spi_w8r8 (st->us,KXSD9_READ (KXSD9_REG_CTRL_C )); -if (ret) +if (ret <0 ) goto error_ret; *val2 = kxsd9_micro_scales[ret &KXSD9_FS_MASK ]; ret =IIO_VAL_INT_PLUS_MICRO ;
Signature · 1 line
2.9.0