* [PATCH] iio: dac: mcp4922: fix error handling in mcp4922_write_raw
@ 2018-08-24 20:24 Marcus Folkesson
2018-08-25 8:47 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Marcus Folkesson @ 2018-08-24 20:24 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler
Cc: linux-iio, linux-kernel, Marcus Folkesson
Do not try to write negative values and make sure that the write goes well.
Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
---
drivers/iio/dac/mcp4922.c | 11 ++++++++---
1 file 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;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] iio: dac: mcp4922: fix error handling in mcp4922_write_raw
2018-08-24 20:24 [PATCH] iio: dac: mcp4922: fix error handling in mcp4922_write_raw Marcus Folkesson
@ 2018-08-25 8:47 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2018-08-25 8:47 UTC (permalink / raw)
To: Marcus Folkesson
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, linux-kernel, Michael Welling
On Fri, 24 Aug 2018 22:24:40 +0200
Marcus Folkesson <marcus.folkesson@gmail.com> wrote:
> Do not try to write negative values and make sure that the write goes well.
>
+CC Michael as it's his driver.
I'll take this as it 'appears' straight forward but I won't be pushing
it out as a non rebasing branch for a few days if I've missed anything.
Applied to the togreg branch of iio.git and pushed out for now as testing
for the autobuilders to play with it.
Thanks,
Jonathan
> Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com>
> ---
> drivers/iio/dac/mcp4922.c | 11 ++++++++---
> 1 file 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;
> }
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-25 8:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-24 20:24 [PATCH] iio: dac: mcp4922: fix error handling in mcp4922_write_raw Marcus Folkesson
2018-08-25 8:47 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).