Commit 163e4074 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon fixes from Guenter Roeck:
 "Fix a number of zero-day bugs, mostly found with module test scripts.
  Nothing major, but potentially annoying and worthwhile to fix"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (adc128d818) Drop write support on inX_input attributes
  hwmon: (emc2103) Clamp limits instead of bailing out
  hwmon: (adm1031) Fix writes to limit registers
  hwmon: (adm1021) Fix cache problem when writing temperature limits
  hwmon: (adm1029) Ensure the fan_div cache is updated in set_fan_div
  hwmon: (amc6821) Fix permissions for temp2_input
  hwmon: (ntc_thermistor) Correct information printed during probe
parents 448bfad8 7fe7381c

drivers/hwmon/adc128d818.c

+14 −14
Original line number Diff line number Diff line
@@ -239,50 +239,50 @@ static ssize_t adc128_show_alarm(struct device *dev, 
	return sprintf(buf, "%u\n", !!(alarms & mask));

}



static SENSOR_DEVICE_ATTR_2(in0_input, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 0, 0);

static SENSOR_DEVICE_ATTR_2(in0_input, S_IRUGO,

			    adc128_show_in, NULL, 0, 0);

static SENSOR_DEVICE_ATTR_2(in0_min, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 0, 1);

static SENSOR_DEVICE_ATTR_2(in0_max, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 0, 2);



static SENSOR_DEVICE_ATTR_2(in1_input, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 1, 0);

static SENSOR_DEVICE_ATTR_2(in1_input, S_IRUGO,

			    adc128_show_in, NULL, 1, 0);

static SENSOR_DEVICE_ATTR_2(in1_min, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 1, 1);

static SENSOR_DEVICE_ATTR_2(in1_max, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 1, 2);



static SENSOR_DEVICE_ATTR_2(in2_input, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 2, 0);

static SENSOR_DEVICE_ATTR_2(in2_input, S_IRUGO,

			    adc128_show_in, NULL, 2, 0);

static SENSOR_DEVICE_ATTR_2(in2_min, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 2, 1);

static SENSOR_DEVICE_ATTR_2(in2_max, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 2, 2);



static SENSOR_DEVICE_ATTR_2(in3_input, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 3, 0);

static SENSOR_DEVICE_ATTR_2(in3_input, S_IRUGO,

			    adc128_show_in, NULL, 3, 0);

static SENSOR_DEVICE_ATTR_2(in3_min, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 3, 1);

static SENSOR_DEVICE_ATTR_2(in3_max, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 3, 2);



static SENSOR_DEVICE_ATTR_2(in4_input, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 4, 0);

static SENSOR_DEVICE_ATTR_2(in4_input, S_IRUGO,

			    adc128_show_in, NULL, 4, 0);

static SENSOR_DEVICE_ATTR_2(in4_min, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 4, 1);

static SENSOR_DEVICE_ATTR_2(in4_max, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 4, 2);



static SENSOR_DEVICE_ATTR_2(in5_input, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 5, 0);

static SENSOR_DEVICE_ATTR_2(in5_input, S_IRUGO,

			    adc128_show_in, NULL, 5, 0);

static SENSOR_DEVICE_ATTR_2(in5_min, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 5, 1);

static SENSOR_DEVICE_ATTR_2(in5_max, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 5, 2);



static SENSOR_DEVICE_ATTR_2(in6_input, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 6, 0);

static SENSOR_DEVICE_ATTR_2(in6_input, S_IRUGO,

			    adc128_show_in, NULL, 6, 0);

static SENSOR_DEVICE_ATTR_2(in6_min, S_IWUSR | S_IRUGO,

			    adc128_show_in, adc128_set_in, 6, 1);

static SENSOR_DEVICE_ATTR_2(in6_max, S_IWUSR | S_IRUGO,

drivers/hwmon/adm1021.c

+8 −6
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static ssize_t set_temp_max(struct device *dev, 
	struct adm1021_data *data = dev_get_drvdata(dev);

	struct i2c_client *client = data->client;

	long temp;

	int err;

	int reg_val, err;



	err = kstrtol(buf, 10, &temp);

	if (err)
@@ -193,10 +193,11 @@ static ssize_t set_temp_max(struct device *dev, 
	temp /= 1000;



	mutex_lock(&data->update_lock);

	data->temp_max[index] = clamp_val(temp, -128, 127);

	reg_val = clamp_val(temp, -128, 127);

	data->temp_max[index] = reg_val * 1000;

	if (!read_only)

		i2c_smbus_write_byte_data(client, ADM1021_REG_TOS_W(index),

					  data->temp_max[index]);

					  reg_val);

	mutex_unlock(&data->update_lock);



	return count;
@@ -210,7 +211,7 @@ static ssize_t set_temp_min(struct device *dev, 
	struct adm1021_data *data = dev_get_drvdata(dev);

	struct i2c_client *client = data->client;

	long temp;

	int err;

	int reg_val, err;



	err = kstrtol(buf, 10, &temp);

	if (err)
@@ -218,10 +219,11 @@ static ssize_t set_temp_min(struct device *dev, 
	temp /= 1000;



	mutex_lock(&data->update_lock);

	data->temp_min[index] = clamp_val(temp, -128, 127);

	reg_val = clamp_val(temp, -128, 127);

	data->temp_min[index] = reg_val * 1000;

	if (!read_only)

		i2c_smbus_write_byte_data(client, ADM1021_REG_THYST_W(index),

					  data->temp_min[index]);

					  reg_val);

	mutex_unlock(&data->update_lock);



	return count;

drivers/hwmon/adm1029.c

+3 −0
Original line number Diff line number Diff line
@@ -232,6 +232,9 @@ static ssize_t set_fan_div(struct device *dev, 
	/* Update the value */

	reg = (reg & 0x3F) | (val << 6);



	/* Update the cache */

	data->fan_div[attr->index] = reg;



	/* Write value */

	i2c_smbus_write_byte_data(client,

				  ADM1029_REG_FAN_DIV[attr->index], reg);

drivers/hwmon/adm1031.c

+5 −3
Original line number Diff line number Diff line
@@ -365,6 +365,7 @@ set_auto_temp_min(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, 0, 127000);

	mutex_lock(&data->update_lock);

	data->auto_temp[nr] = AUTO_TEMP_MIN_TO_REG(val, data->auto_temp[nr]);

	adm1031_write_value(client, ADM1031_REG_AUTO_TEMP(nr),
@@ -394,6 +395,7 @@ set_auto_temp_max(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, 0, 127000);

	mutex_lock(&data->update_lock);

	data->temp_max[nr] = AUTO_TEMP_MAX_TO_REG(val, data->auto_temp[nr],

						  data->pwm[nr]);
@@ -696,7 +698,7 @@ static ssize_t set_temp_min(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, -55000, nr == 0 ? 127750 : 127875);

	val = clamp_val(val, -55000, 127000);

	mutex_lock(&data->update_lock);

	data->temp_min[nr] = TEMP_TO_REG(val);

	adm1031_write_value(client, ADM1031_REG_TEMP_MIN(nr),
@@ -717,7 +719,7 @@ static ssize_t set_temp_max(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, -55000, nr == 0 ? 127750 : 127875);

	val = clamp_val(val, -55000, 127000);

	mutex_lock(&data->update_lock);

	data->temp_max[nr] = TEMP_TO_REG(val);

	adm1031_write_value(client, ADM1031_REG_TEMP_MAX(nr),
@@ -738,7 +740,7 @@ static ssize_t set_temp_crit(struct device *dev, struct device_attribute *attr, 
	if (ret)

		return ret;



	val = clamp_val(val, -55000, nr == 0 ? 127750 : 127875);

	val = clamp_val(val, -55000, 127000);

	mutex_lock(&data->update_lock);

	data->temp_crit[nr] = TEMP_TO_REG(val);

	adm1031_write_value(client, ADM1031_REG_TEMP_CRIT(nr),

drivers/hwmon/amc6821.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, 
	get_temp_alarm, NULL, IDX_TEMP1_MAX);

static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO,

	get_temp_alarm, NULL, IDX_TEMP1_CRIT);

static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO | S_IWUSR,

static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO,

	get_temp, NULL, IDX_TEMP2_INPUT);

static SENSOR_DEVICE_ATTR(temp2_min, S_IRUGO | S_IWUSR, get_temp,

	set_temp, IDX_TEMP2_MIN);

CRA Git | Maintained and supported by SUSTech CRA and CCSE