lkml.org 
[lkml]   [2016]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.10 125/180] iio: accel: kxsd9: fix the usage of spi_w8r8()
    Date
    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>
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/iio/accel/kxsd9.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/iio/accel/kxsd9.c b/drivers/iio/accel/kxsd9.c
    index 7c9a1d9..a22c427 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;
    --
    2.8.0.rc2.1.gbe9624a
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:2.788 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site