projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iio-for-3.20a_take2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
iio
/
inkern.c
diff --git
a/drivers/iio/inkern.c
b/drivers/iio/inkern.c
index 2800b80ea990a6c03dc7cbab71b06b179aeacf22..c8bad3cf891df0f1da009eeeeb1bc4809b879eda 100644
(file)
--- a/
drivers/iio/inkern.c
+++ b/
drivers/iio/inkern.c
@@
-452,6
+452,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,