Commit ec895727 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v7.1-rc3' of... 

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

Pull hwmon fixes from Guenter Roeck:

 - ads7871: Fix endianness bug in 16-bit register reads

 - lm75: Fix configuration register writes and AS6200/TMP112 setup and
   alarm handling

 - lm63: Fix TOCTOU problems

 - corsair-psu: Close HID device on probe errors

 - ltc2992: Fix overflow and threshold range

 - Documentation: fix link to ideapad-laptop.c file

 - Remove stale CONFIG_SENSORS_SBRMI Makefile reference

* tag 'hwmon-for-v7.1-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (ads7871) Fix endianness bug in 16-bit register reads
  hwmon: (lm75) Fix configuration register writes.
  hwmon: (lm75) Fix AS6200 and TMP112 setup and alarm handling
  hwmon: (lm63) Add locking to avoid TOCTOU
  hwmon: (corsair-psu) Close HID device on probe errors
  hwmon: Remove stale CONFIG_SENSORS_SBRMI Makefile reference
  Documentation: hwmon: fix link to ideapad-laptop.c file
  hwmon: (ltc2992) Fix u32 overflow in power read path
  hwmon: (ltc2992) Clamp threshold writes to hardware range
parents 234d72ae 99076a17

Documentation/hwmon/yogafan.rst

+1 −1
Original line number Diff line number Diff line
@@ -135,4 +135,4 @@ References 


4. **Lenovo IdeaPad Laptop Driver:** Reference for DMI-based hardware

   feature gating in Lenovo laptops.

   https://github.com/torvalds/linux/blob/master/drivers/platform/x86/ideapad-laptop.c
 
   https://github.com/torvalds/linux/blob/master/drivers/platform/x86/lenovo/ideapad-laptop.c

drivers/hwmon/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ obj-$(CONFIG_SENSORS_PWM_FAN) += pwm-fan.o 
obj-$(CONFIG_SENSORS_QNAP_MCU_HWMON)	+= qnap-mcu-hwmon.o

obj-$(CONFIG_SENSORS_RASPBERRYPI_HWMON)	+= raspberrypi-hwmon.o

obj-$(CONFIG_SENSORS_SBTSI)	+= sbtsi_temp.o

obj-$(CONFIG_SENSORS_SBRMI)	+= sbrmi.o

obj-$(CONFIG_SENSORS_SCH56XX_COMMON)+= sch56xx-common.o

obj-$(CONFIG_SENSORS_SCH5627)	+= sch5627.o

obj-$(CONFIG_SENSORS_SCH5636)	+= sch5636.o

drivers/hwmon/ads7871.c

+5 −1
Original line number Diff line number Diff line
@@ -77,9 +77,13 @@ static int ads7871_read_reg8(struct spi_device *spi, int reg) 
static int ads7871_read_reg16(struct spi_device *spi, int reg)

{

	int ret;



	reg = reg | INST_READ_BM | INST_16BIT_BM;

	ret = spi_w8r16(spi, reg);

	if (ret < 0)

		return ret;



	return le16_to_cpu((__force __le16)ret);

}



static int ads7871_write_reg8(struct spi_device *spi, int reg, u8 val)

drivers/hwmon/corsair-psu.c

+2 −2
Original line number Diff line number Diff line
@@ -796,13 +796,13 @@ static int corsairpsu_probe(struct hid_device *hdev, const struct hid_device_id 
	ret = corsairpsu_init(priv);

	if (ret < 0) {

		dev_err(&hdev->dev, "unable to initialize device (%d)\n", ret);

		goto fail_and_stop;

		goto fail_and_close;

	}



	ret = corsairpsu_fwinfo(priv);

	if (ret < 0) {

		dev_err(&hdev->dev, "unable to query firmware (%d)\n", ret);

		goto fail_and_stop;

		goto fail_and_close;

	}



	corsairpsu_get_criticals(priv);

drivers/hwmon/lm63.c

+30 −9
Original line number Diff line number Diff line
@@ -333,7 +333,13 @@ static ssize_t show_fan(struct device *dev, struct device_attribute *devattr, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct lm63_data *data = lm63_update_device(dev);

	return sprintf(buf, "%d\n", FAN_FROM_REG(data->fan[attr->index]));

	int fan;



	mutex_lock(&data->update_lock);

	fan = FAN_FROM_REG(data->fan[attr->index]);

	mutex_unlock(&data->update_lock);



	return sprintf(buf, "%d\n", fan);

}



static ssize_t set_fan(struct device *dev, struct device_attribute *dummy,
@@ -366,12 +372,14 @@ static ssize_t show_pwm1(struct device *dev, struct device_attribute *devattr, 
	int nr = attr->index;

	int pwm;



	mutex_lock(&data->update_lock);

	if (data->pwm_highres)

		pwm = data->pwm1[nr];

	else

		pwm = data->pwm1[nr] >= 2 * data->pwm1_freq ?

		       255 : (data->pwm1[nr] * 255 + data->pwm1_freq) /

		       (2 * data->pwm1_freq);

	mutex_unlock(&data->update_lock);



	return sprintf(buf, "%d\n", pwm);

}
@@ -529,6 +537,7 @@ static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr, 
	int nr = attr->index;

	int temp;



	mutex_lock(&data->update_lock);

	if (!nr) {

		/*

		 * Use unsigned temperature unless its value is zero.
@@ -544,7 +553,10 @@ static ssize_t show_temp11(struct device *dev, struct device_attribute *devattr, 
		else

			temp = TEMP11_FROM_REG(data->temp11[nr]);

	}

	return sprintf(buf, "%d\n", temp + data->temp2_offset);

	temp += data->temp2_offset;

	mutex_unlock(&data->update_lock);



	return sprintf(buf, "%d\n", temp);

}



static ssize_t set_temp11(struct device *dev, struct device_attribute *devattr,
@@ -592,9 +604,14 @@ static ssize_t temp2_crit_hyst_show(struct device *dev, 
				    struct device_attribute *dummy, char *buf)

{

	struct lm63_data *data = lm63_update_device(dev);

	return sprintf(buf, "%d\n", temp8_from_reg(data, 2)

		       + data->temp2_offset

		       - TEMP8_FROM_REG(data->temp2_crit_hyst));

	int temp;



	mutex_lock(&data->update_lock);

	temp = temp8_from_reg(data, 2) + data->temp2_offset

	     - TEMP8_FROM_REG(data->temp2_crit_hyst);

	mutex_unlock(&data->update_lock);



	return sprintf(buf, "%d\n", temp);

}



static ssize_t show_lut_temp_hyst(struct device *dev,
@@ -602,10 +619,14 @@ static ssize_t show_lut_temp_hyst(struct device *dev, 
{

	struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);

	struct lm63_data *data = lm63_update_device(dev);

	int temp;



	return sprintf(buf, "%d\n", lut_temp_from_reg(data, attr->index)

		       + data->temp2_offset

		       - TEMP8_FROM_REG(data->lut_temp_hyst));

	mutex_lock(&data->update_lock);

	temp = lut_temp_from_reg(data, attr->index) + data->temp2_offset

	     - TEMP8_FROM_REG(data->lut_temp_hyst);

	mutex_unlock(&data->update_lock);



	return sprintf(buf, "%d\n", temp);

}



/*
@@ -616,7 +637,7 @@ static ssize_t temp2_crit_hyst_store(struct device *dev, 
				     struct device_attribute *dummy,

				     const char *buf, size_t count)

{

	struct lm63_data *data = dev_get_drvdata(dev);

	struct lm63_data *data = lm63_update_device(dev);

	struct i2c_client *client = data->client;

	long val;

	int err;