Merge 3.16-rc5 into staging-next
We want the fixes in -rc5 in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -374,7 +374,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev,
|
||||
return -EAGAIN;
|
||||
}
|
||||
}
|
||||
map_val = chan->channel + TOTAL_CHANNELS;
|
||||
map_val = adc_dev->channel_step[chan->scan_index];
|
||||
|
||||
/*
|
||||
* We check the complete FIFO. We programmed just one entry but in case
|
||||
|
Reference in New Issue
Block a user