Skip to content

Commit

Permalink
Merge tag 'iio-fixes-for-3.11c' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history
…/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.
  • Loading branch information
Greg Kroah-Hartman committed Aug 20, 2013
2 parents d4e4ab8 + 71f4264 commit 06cdff8
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/iio/light/adjd_s311.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ static int adjd_s311_read_raw(struct iio_dev *indio_dev,

switch (mask) {
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)
return ret;
return IIO_VAL_INT;
Expand Down

0 comments on commit 06cdff8

Please sign in to comment.