]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
iio: dac: mcp4922: fix error handling in mcp4922_write_raw
authorMarcus Folkesson <marcus.folkesson@gmail.com>
Fri, 24 Aug 2018 20:24:40 +0000 (22:24 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sat, 25 Aug 2018 08:47:36 +0000 (09:47 +0100)
Do not try to write negative values and make sure that the write goes well.

Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/dac/mcp4922.c

index bf9aa3fc0534e6786c5f5fe605cfd43b9a383690..b5190d1dae8e33a15e148ff78471fb09dd4b90d1 100644 (file)
@@ -94,17 +94,22 @@ static int mcp4922_write_raw(struct iio_dev *indio_dev,
                long mask)
 {
        struct mcp4922_state *state = iio_priv(indio_dev);
+       int ret;
 
        if (val2 != 0)
                return -EINVAL;
 
        switch (mask) {
        case IIO_CHAN_INFO_RAW:
-               if (val > GENMASK(chan->scan_type.realbits-1, 0))
+               if (val < 0 || val > GENMASK(chan->scan_type.realbits - 1, 0))
                        return -EINVAL;
                val <<= chan->scan_type.shift;
-               state->value[chan->channel] = val;
-               return mcp4922_spi_write(state, chan->channel, val);
+
+               ret = mcp4922_spi_write(state, chan->channel, val);
+               if (!ret)
+                       state->value[chan->channel] = val;
+               return ret;
+
        default:
                return -EINVAL;
        }