| Message ID | d1b58bc36bcb0204bca811d97a8ef1063fe876e0.1565006479.git.amy.shih@advantech.com.tw (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v4,1/2] hwmon: (nct7904) Fix the incorrect return value of case hwmon_fan_min in function "nct7904_write_fan". | expand |
On Tue, Aug 06, 2019 at 02:30:07AM +0000, Amy.Shih@advantech.com.tw wrote: > From: "amy.shih" <amy.shih@advantech.com.tw> > > Return the -EINVAL(Invalid argument) when writing the values <= 0 > to sysfs node fan[1-*]_min. > > Signed-off-by: amy.shih <amy.shih@advantech.com.tw> > This again fixes a previous patch of the series. Please squash the entire series (all three patches) together in a single patch. Thanks, Guenter > Changes in v4: > - Fix the incorrect return value of case hwmon_fan_min in function "nct7904_write_fan". > Changes in v3: > - Squashed subsequent fixes of below patches into one patch. > > -- Fix bad fallthrough in various switch statements. > -- Fix the wrong declared of tmp as u8 in nct7904_write_in, declared tmp to int. > -- Fix incorrect register setting of voltage. > -- Fix incorrect register bit mapping of temperature alarm. > -- Fix wrong return code 0x1fff in function nct7904_write_fan. > -- Delete wrong comment in function nct7904_write_in. > -- Fix wrong attribute names for temperature. > -- Fix wrong registers setting for temperature. > > Changes in v2: > - Fix bad fallthrough in various switch statements. > - Fix the wrong declared of tmp as u8 in nct7904_write_in, declared tmp to int. > --- > drivers/hwmon/nct7904.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c > index d842c10ba11f..6527b56e4f6c 100644 > --- a/drivers/hwmon/nct7904.c > +++ b/drivers/hwmon/nct7904.c > @@ -551,7 +551,7 @@ static int nct7904_write_fan(struct device *dev, u32 attr, int channel, > switch (attr) { > case hwmon_fan_min: > if (val <= 0) > - return 0; > + return -EINVAL; > > val = clamp_val((1350000 + (val >> 1)) / val, 1, 0x1fff); > tmp = (val >> 5) & 0xff; > -- > 2.17.1 >
diff --git a/drivers/hwmon/nct7904.c b/drivers/hwmon/nct7904.c index d842c10ba11f..6527b56e4f6c 100644 --- a/drivers/hwmon/nct7904.c +++ b/drivers/hwmon/nct7904.c @@ -551,7 +551,7 @@ static int nct7904_write_fan(struct device *dev, u32 attr, int channel, switch (attr) { case hwmon_fan_min: if (val <= 0) - return 0; + return -EINVAL; val = clamp_val((1350000 + (val >> 1)) / val, 1, 0x1fff); tmp = (val >> 5) & 0xff;