lkml.org 
[lkml]   [2018]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] iio: light: fix test for val being not zero or not one.
On Mon, 30 Jul 2018 13:59:18 +0100
Colin King <colin.king@canonical.com> wrote:

> From: Colin Ian King <colin.king@canonical.com>
>
> The current check on val always results in true and so the
> call to sii1133_update_adcsens never gets called. Fix this check
> so it returns with -EINVAL only when val is not zero and not one.
>
> Detected by CoverityScan, CID#1472099 ("Logically dead code")
>
> Fixes: e01e7eaf37d8 ("iio: light: introduce si1133")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Thanks!,

Applied to the fixes-togreg branch of iio.git. Will send upstream after
the merge window closes now.

Jonathan

> ---
> drivers/iio/light/si1133.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/light/si1133.c b/drivers/iio/light/si1133.c
> index d3fbeb3bc463..5ac22c46da1f 100644
> --- a/drivers/iio/light/si1133.c
> +++ b/drivers/iio/light/si1133.c
> @@ -838,7 +838,7 @@ static int si1133_write_raw(struct iio_dev *iio_dev,
> switch (chan->type) {
> case IIO_INTENSITY:
> case IIO_UVINDEX:
> - if (val != 0 || val != 1)
> + if (val != 0 && val != 1)
> return -EINVAL;
>
> return si1133_update_adcsens(data,

\
 
 \ /
  Last update: 2018-07-30 21:10    [W:0.030 / U:0.376 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site