Re: [PATCH] 0001-xilinx-xadc-core-Fix-voltage-offset.patch

[Jonathan Cameron <jic23@kernel.org>]

On 05/12/14 16:12, Fabien Proriol wrote:
> On 22/11/2014 12:44, Jonathan Cameron wrote:
>> Hi
>>
>> This patch appears to be against a relatively ancient kernel.
>> Would you mind rebasing it on linus' current tree?
>>
>> Thanks,
>>
>> Jonathan
> 
> Ok, this is the patch rebase on Linus Trovald master
> 
> 
> From 8833373032c2c4a48569137e0d10804131b98f1d Mon Sep 17 00:00:00 2001
> From: Fabien Proriol <fabien.proriol@jdsu.com>
> Date: Mon, 17 Nov 2014 09:46:02 +0100
> Subject: [PATCH] iio: Fix iio_channel_read return if channel havn't info
> 
> 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>
Applied - by hand as something odd happened to this email to the
fixes-togreg branch of iio.git

Thanks,

Jonathan
> ---
>  drivers/iio/inkern.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
> index f084610..d33590e 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,
>