* [PATCH] iio: light: fix test for val being not zero or not one.
@ 2018-07-30 12:59 Colin King
2018-07-30 19:09 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2018-07-30 12:59 UTC (permalink / raw)
To: Jonathan Cameron, Hartmut Knaack, Lars-Peter Clausen,
Peter Meerwald-Stadler, linux-iio
Cc: kernel-janitors, linux-kernel
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>
---
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,
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] iio: light: fix test for val being not zero or not one.
2018-07-30 12:59 [PATCH] iio: light: fix test for val being not zero or not one Colin King
@ 2018-07-30 19:09 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2018-07-30 19:09 UTC (permalink / raw)
To: Colin King
Cc: Hartmut Knaack, Lars-Peter Clausen, Peter Meerwald-Stadler,
linux-iio, kernel-janitors, linux-kernel
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,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-07-30 20:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-30 12:59 [PATCH] iio: light: fix test for val being not zero or not one Colin King
2018-07-30 19:09 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).