Commit 3b9dfd9e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v6.11-rc6' of... 

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

Pull hwmon fixes from Guenter Roeck:

 - pt5161l: Fix invalid temperature reading of bad ADC values

 - asus-ec-sensors: Remove unsupported VRM temperature from X570-E
   GAMING

* tag 'hwmon-for-v6.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (pt5161l) Fix invalid temperature reading
  hwmon: (asus-ec-sensors) remove VRM temp X570-E GAMING
parents 0dd5dd63 7bbc0795

drivers/hwmon/asus-ec-sensors.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static const struct ec_board_info board_info_strix_b550_i_gaming = { 


static const struct ec_board_info board_info_strix_x570_e_gaming = {

	.sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |

		SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |

		SENSOR_TEMP_T_SENSOR |

		SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU |

		SENSOR_IN_CPU_CORE,

	.mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,

drivers/hwmon/pt5161l.c

+2 −2
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static int pt5161l_read(struct device *dev, enum hwmon_sensor_types type, 
	struct pt5161l_data *data = dev_get_drvdata(dev);

	int ret;

	u8 buf[8];

	long adc_code;

	u32 adc_code;



	switch (attr) {

	case hwmon_temp_input:
@@ -449,7 +449,7 @@ static int pt5161l_read(struct device *dev, enum hwmon_sensor_types type, 


		adc_code = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0];

		if (adc_code == 0 || adc_code >= 0x3ff) {

			dev_dbg(dev, "Invalid adc_code %lx\n", adc_code);

			dev_dbg(dev, "Invalid adc_code %x\n", adc_code);

			return -EIO;

		}