Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0833627f authored by Marcus Folkesson's avatar Marcus Folkesson Committed by Jonathan Cameron
Browse files

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: default avatarMarcus Folkesson <marcus.folkesson@gmail.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent e2b01faf

drivers/iio/dac/mcp4922.c

+8 −3
Original line number Original line Diff line number Diff line
@@ -94,17 +94,22 @@ static int mcp4922_write_raw(struct iio_dev *indio_dev, 
		long mask)

		long mask)

{

{

	struct mcp4922_state *state = iio_priv(indio_dev);

	struct mcp4922_state *state = iio_priv(indio_dev);

	int ret;





	if (val2 != 0)

	if (val2 != 0)

		return -EINVAL;

		return -EINVAL;





	switch (mask) {

	switch (mask) {

	case IIO_CHAN_INFO_RAW:

	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;

			return -EINVAL;

		val <<= chan->scan_type.shift;

		val <<= chan->scan_type.shift;



		ret = mcp4922_spi_write(state, chan->channel, val);

		if (!ret)

			state->value[chan->channel] = val;

			state->value[chan->channel] = val;

		return mcp4922_spi_write(state, chan->channel, val);

		return ret;



	default:

	default:

		return -EINVAL;

		return -EINVAL;

	}

	}