Re: hwmon/f75375s.c: buggy if()

[Mark M. Hoffman]

Hi:

* Riku Voipio <[EMAIL PROTECTED]> [2007-10-17 23:45:08 +0300]:
> > <--  snip  -->
> > 
> > ...
> > static ssize_t set_pwm_mode(struct device *dev, struct device_attribute 
> > *attr,
> >                 const char *buf, size_t count)
> > {
> > ...
> >         if (val != 0 || val != 1 || data->kind == f75373)
> >                 return -EINVAL;
> > ...
> > 
> > <--  snip  -->
> 
> > I'm not sure what exactly was intended, but it was for sure not intended 
> > to always return -EINVAL...
> 
> Aiee. val should be 1 or 0, and kind must not be f75373.
> 
> Signed-off-by: Riku Voipio <[EMAIL PROTECTED]>
> ---
>  drivers/hwmon/f75375s.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
> index f1df57a..885bfe9 100644
> --- a/drivers/hwmon/f75375s.c
> +++ b/drivers/hwmon/f75375s.c
> @@ -344,7 +344,7 @@ static ssize_t set_pwm_mode(struct device *dev, struct 
> device_attribute *attr,
>     int val = simple_strtoul(buf, NULL, 10);
>     u8 conf = 0;
> 
> -   if (val != 0 || val != 1 || data->kind == f75373)
> +   if (!(val == 0 || val == 1 ) || data->kind == f75373)
>         return -EINVAL;
> 
>     mutex_lock(&data->update_lock);
> --
> 1.5.3.1

That patch doesn't apply here, so I applied this:

commit 805763cd743f2aed41dc61a55569fa43cf1f240c
Author: Riku Voipio <[EMAIL PROTECTED]>
Date:   Thu Oct 18 09:29:53 2007 -0400

    hwmon: (f75375s) fix pwm mode setting
    
    Spotted by the Coverity checker. (Thanks Adrian Bunk)
    
    Signed-off-by: Riku Voipio <[EMAIL PROTECTED]>
    Signed-off-by: Mark M. Hoffman <[EMAIL PROTECTED]>

diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c
index 13a0413..59a3470 100644
--- a/drivers/hwmon/f75375s.c
+++ b/drivers/hwmon/f75375s.c
@@ -323,7 +323,7 @@ static ssize_t set_pwm_mode(struct device *dev, struct 
device_attribute *attr,
        int val = simple_strtoul(buf, NULL, 10);
        u8 conf = 0;
 
-       if (val != 0 || val != 1 || data->kind == f75373)
+       if (!(val == 0 || val == 1) || data->kind == f75373)
                return -EINVAL;
 
        mutex_lock(&data->update_lock);

Thanks & regards,

-- 
Mark M. Hoffman
[EMAIL PROTECTED]

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/