diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-19 20:27:12 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-19 20:27:12 -0400 |
| commit | 06cdff8a593bc52d53ce5c4c5cfc961a7fc32ad3 (patch) | |
| tree | e5e56531a153cace5a64b8ce9262ea126e30da6b | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| parent | 71f42642af7b1bc7c36fb73ad8f7e7ab2ab8b2de (diff) | |
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.
| -rw-r--r-- | drivers/iio/light/adjd_s311.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/iio/light/adjd_s311.c b/drivers/iio/light/adjd_s311.c index 5f4749e60b04..c1cd5698b8ae 100644 --- a/drivers/iio/light/adjd_s311.c +++ b/drivers/iio/light/adjd_s311.c | |||
| @@ -232,7 +232,8 @@ static int adjd_s311_read_raw(struct iio_dev *indio_dev, | |||
| 232 | 232 | ||
| 233 | switch (mask) { | 233 | switch (mask) { |
| 234 | case IIO_CHAN_INFO_RAW: | 234 | case IIO_CHAN_INFO_RAW: |
| 235 | ret = adjd_s311_read_data(indio_dev, chan->address, val); | 235 | ret = adjd_s311_read_data(indio_dev, |
| 236 | ADJD_S311_DATA_REG(chan->address), val); | ||
| 236 | if (ret < 0) | 237 | if (ret < 0) |
| 237 | return ret; | 238 | return ret; |
| 238 | return IIO_VAL_INT; | 239 | return IIO_VAL_INT; |