diff options
| author | Fabien Proriol <fabien.proriol@jdsu.com> | 2015-01-01 12:46:48 +0000 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2015-01-01 12:46:48 +0000 |
| commit | 65de7654d39c70c2b942f801cea01590cf7e3458 (patch) | |
| tree | fdb99856165a72ffa2b217c9fddc66e22caa5116 | |
| parent | 2eacc608b3bf3519fc353c558454873f4589146d (diff) | |
iio: iio: Fix iio_channel_read return if channel havn't infoiio-fixes-for-3.19a
When xilinx-xadc is used with hwmon driver to read voltage, offset used
for temperature is always applied whatever the channel.
iio_channel_read must return an error to avoid offset for channel
without IIO_CHAN_INFO_OFFSET property.
Signed-off-by: Fabien Proriol <fabien.proriol@jdsu.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| -rw-r--r-- | drivers/iio/inkern.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c index f0846108d006..d33590e89337 100644 --- a/drivers/iio/inkern.c +++ b/drivers/iio/inkern.c @@ -426,6 +426,9 @@ static int iio_channel_read(struct iio_channel *chan, int *val, int *val2, if (val2 == NULL) val2 = &unused; + if(!iio_channel_has_info(chan->channel, info)) + return -EINVAL; + if (chan->indio_dev->info->read_raw_multi) { ret = chan->indio_dev->info->read_raw_multi(chan->indio_dev, chan->channel, INDIO_MAX_RAW_ELEMENTS, |