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

Commit 06cdff8a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-3.11c' of... 

Merge tag 'iio-fixes-for-3.11c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

Third round of IIO fixes for the 3.11 series.

Only one fix in this pull request.

A straight forward incorrect read address in the adjd_s311 driver.
parents d4e4ab86 71f42642

drivers/iio/light/adjd_s311.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -232,7 +232,8 @@ static int adjd_s311_read_raw(struct iio_dev *indio_dev, 




	switch (mask) {

	switch (mask) {

	case IIO_CHAN_INFO_RAW:

	case IIO_CHAN_INFO_RAW:

		ret = adjd_s311_read_data(indio_dev, chan->address, val);

		ret = adjd_s311_read_data(indio_dev,

			ADJD_S311_DATA_REG(chan->address), val);

		if (ret < 0)

		if (ret < 0)

			return ret;

			return ret;

		return IIO_VAL_INT;

		return IIO_VAL_INT;