summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorMarcus Folkesson <marcus.folkesson@gmail.com>2018-08-24 22:24:40 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2018-08-25 09:47:36 +0100
commit0833627fc3f757a0dca11e2a9c46c96335a900ee (patch)
treeb4fe3b51463a57a51321553b6a404968bd066eb1 /drivers/iio
parente2b01faf6cde01b2ed5a7fb8a63e5fa25c2257ea (diff)
downloadlinux-0833627fc3f757a0dca11e2a9c46c96335a900ee.tar.gz
linux-0833627fc3f757a0dca11e2a9c46c96335a900ee.tar.bz2
linux-0833627fc3f757a0dca11e2a9c46c96335a900ee.zip
iio: dac: mcp4922: fix error handling in mcp4922_write_raw
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>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/dac/mcp4922.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/iio/dac/mcp4922.c b/drivers/iio/dac/mcp4922.c
index bf9aa3fc0534..b5190d1dae8e 100644
--- a/drivers/iio/dac/mcp4922.c
+++ b/drivers/iio/dac/mcp4922.c
@@ -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;
}