lkml.org 
[lkml]   [2018]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 3.18 21/98] iio: iio: Fix iio_channel_read return if channel havn't info
    Date
    From: Fabien Proriol <fabien.proriol@jdsu.com>

    [ Upstream commit 65de7654d39c70c2b942f801cea01590cf7e3458 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iio/inkern.c | 3 +++
    1 file changed, 3 insertions(+)

    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,
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-10-25 16:29    [W:2.292 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site