hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (emc2103) Clamp limits instead of bailing out 

It is customary to clamp limits instead of bailing out with an error
if a configured limit is out of the range supported by the driver.
This simplifies limit configuration, since the user will not typically
know chip and/or driver specific limits.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2014-07-06 11:39:24 -07:00
parent 145e74a4e5
commit f6c2dd2010
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/hwmon/emc2103.c
View File

@ -250,9 +250,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *da,
if (result < 0) if (result < 0)
return result; return result;
val = DIV_ROUND_CLOSEST(val, 1000); val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), -63, 127);
if ((val < -63) || (val > 127))
return -EINVAL;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->temp_min[nr] = val; data->temp_min[nr] = val;
@ -274,9 +272,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *da,
if (result < 0) if (result < 0)
return result; return result;
val = DIV_ROUND_CLOSEST(val, 1000); val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), -63, 127);
if ((val < -63) || (val > 127))
return -EINVAL;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->temp_max[nr] = val; data->temp_max[nr] = val;
@ -390,15 +386,14 @@ static ssize_t set_fan_target(struct device *dev, struct device_attribute *da,
{ {
struct emc2103_data *data = emc2103_update_device(dev); struct emc2103_data *data = emc2103_update_device(dev);
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
long rpm_target; unsigned long rpm_target;
int result = kstrtol(buf, 10, &rpm_target); int result = kstrtoul(buf, 10, &rpm_target);
if (result < 0) if (result < 0)
return result; return result;
/* Datasheet states 16384 as maximum RPM target (table 3.2) */ /* Datasheet states 16384 as maximum RPM target (table 3.2) */
if ((rpm_target < 0) || (rpm_target > 16384)) rpm_target = clamp_val(rpm_target, 0, 16384);
return -EINVAL;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);