History

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.

Greg Kroah-Hartman committed 13 years ago

Commit 06cdff82 parents d4e4ab8 71f42641 file · +2 −1Browse files

Unified · Split

drivers/iio/light/adjd_s311.c+2−1
@@ -232,7 +232,8 @@ static int adjd_s311_read_raw(struct iio_dev *indio_dev, · 231 unmodified lines
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;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t