Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-23 05:30:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

hwmon fixes for v6.11-rc6

Browse Source 
- pt5161l: Fix invalid temperature reading of bad ADC values
 
 - asus-ec-sensors: Remove unsupported VRM temperature from X570-E GAMING
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEiHPvMQj9QTOCiqgVyx8mb86fmYEFAmbQhm8ACgkQyx8mb86f
 mYHNWxAAkAfjWyyReWdn7H6Biq31dAE7hmvxIPdNr4uEKZA9DUhKnLhjA5jiuVX/
 7+8+SF6YcB0xtoMz9c4MKiOPLv+gPs2SjNfzsPM0Tti1awhVlIGao+jRXQoJoZEO
 28hRymQq8r2YTFWrkSqpRgG0D4aBMs3+GBHgL9uTv+93avzT10OjL9bm70GgWUl5
 M4QKJBaJpLH9bJBdYtLOddpc1iFHfTishCopQsUfnmZo6TWFeNKtZubyo+X9lRhY
 q0LM9xjRDmhYTOWZZS+u3AxGoIZG0+D+5lT+dbE37cOgnNsAOuRy/RTNaaLFqQHz
 bCvBWygjP2JxOr8lhFqq2jReOziywaTcZgrQwBT3BbvnmPVBUDsiedS9Y1OYGLUq
 bGx8A34AgALkfCC+I++TY2egYrDUMnqTA7T6XKCp5NLQVTseO0A8Pdw/2tjkWIof
 FsQBdMvJdc2xXNWWVeC8j71TurICv5KmrE5/M5K4S1HmVctQ6l9149N9NFf9CuEh
 3vx+pjU+u7e+yby4gDROp2SPdAFHqf9GD33Q6zigXkaX2XJWvPJ8wLVUQbT54DcO
 O2/nKQvhhzZzw/b3KlvvZVJ60gIZCm1jvJYq6tqWz6v5D27W19ooipWTXN1paqIX
 Ae2lBrHYVBVLG73bXMV0ajdB3oyqKL5OsNxCFjINGl4l8bAz3hA=
 =sg+p
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-08-30 06:22:35 +12:00
commit 3b9dfd9e59
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hwmon/asus-ec-sensors.c
View File

@ -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,

4
drivers/hwmon/pt5161l.c
View File

@ -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;
}