Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6c2dd20 authored by Guenter Roeck's avatar Guenter Roeck
Browse files

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: default avatarJean Delvare <jdelvare@suse.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 145e74a4

drivers/hwmon/emc2103.c

+5 −10
Original line number Diff line number Diff line
@@ -250,9 +250,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *da, 
	if (result < 0)

		return result;



	val = DIV_ROUND_CLOSEST(val, 1000);

	if ((val < -63) || (val > 127))

		return -EINVAL;

	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), -63, 127);



	mutex_lock(&data->update_lock);

	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)

		return result;



	val = DIV_ROUND_CLOSEST(val, 1000);

	if ((val < -63) || (val > 127))

		return -EINVAL;

	val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), -63, 127);



	mutex_lock(&data->update_lock);

	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 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)

		return result;



	/* Datasheet states 16384 as maximum RPM target (table 3.2) */

	if ((rpm_target < 0) || (rpm_target > 16384))

		return -EINVAL;

	rpm_target = clamp_val(rpm_target, 0, 16384);



	mutex_lock(&data->update_lock);