diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2016-06-17 15:22:24 +0200 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-08-19 23:08:43 -0400 |
| commit | 94f93848624aea581967a37e462909b3b0e6f0cb (patch) | |
| tree | 0a369ff3d735794cb6b080c0395e85733dbdf695 /drivers/iio | |
| parent | b2372ff74a06656f67b24e73477f81e25956df89 (diff) | |
| download | linux-rt-94f93848624aea581967a37e462909b3b0e6f0cb.tar.gz | |
iio: accel: kxsd9: fix the usage of spi_w8r8()
[ Upstream commit 0c1f91b98552da49d9d8eed32b3132a58d2f4598 ]
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>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/accel/kxsd9.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c index 98ba761cbb9c..d8738d4f8df3 100644 --- a/drivers/iio/accel/kxsd9.c +++ b/drivers/iio/accel/kxsd9.c @@ -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; |