| From 0c1f91b98552da49d9d8eed32b3132a58d2f4598 Mon Sep 17 00:00:00 2001 |
| From: Linus Walleij <linus.walleij@linaro.org> |
| Date: Fri, 17 Jun 2016 15:22:24 +0200 |
| Subject: iio: accel: kxsd9: fix the usage of spi_w8r8() |
| |
| From: Linus Walleij <linus.walleij@linaro.org> |
| |
| commit 0c1f91b98552da49d9d8eed32b3132a58d2f4598 upstream. |
| |
| 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. |
| |
| Fixes: d34dbee8ac8e ("staging:iio:accel:kxsd9 cleanup and conversion to iio_chan_spec.") |
| Signed-off-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Jonathan Cameron <jic23@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/iio/accel/kxsd9.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/iio/accel/kxsd9.c |
| +++ b/drivers/iio/accel/kxsd9.c |
| @@ -81,7 +81,7 @@ static int kxsd9_write_scale(struct iio_ |
| |
| 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 |
| 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; |
