Skip to content

Commit 3b9dfd9

Browse files
committed
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
2 parents 0dd5dd6 + 7bbc079 commit 3b9dfd9

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/hwmon/asus-ec-sensors.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ static const struct ec_board_info board_info_strix_b550_i_gaming = {
420420

421421
static const struct ec_board_info board_info_strix_x570_e_gaming = {
422422
.sensors = SENSOR_SET_TEMP_CHIPSET_CPU_MB |
423-
SENSOR_TEMP_T_SENSOR | SENSOR_TEMP_VRM |
423+
SENSOR_TEMP_T_SENSOR |
424424
SENSOR_FAN_CHIPSET | SENSOR_CURR_CPU |
425425
SENSOR_IN_CPU_CORE,
426426
.mutex_path = ASUS_HW_ACCESS_MUTEX_ASMX,

drivers/hwmon/pt5161l.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ static int pt5161l_read(struct device *dev, enum hwmon_sensor_types type,
427427
struct pt5161l_data *data = dev_get_drvdata(dev);
428428
int ret;
429429
u8 buf[8];
430-
long adc_code;
430+
u32 adc_code;
431431

432432
switch (attr) {
433433
case hwmon_temp_input:
@@ -449,7 +449,7 @@ static int pt5161l_read(struct device *dev, enum hwmon_sensor_types type,
449449

450450
adc_code = buf[3] << 24 | buf[2] << 16 | buf[1] << 8 | buf[0];
451451
if (adc_code == 0 || adc_code >= 0x3ff) {
452-
dev_dbg(dev, "Invalid adc_code %lx\n", adc_code);
452+
dev_dbg(dev, "Invalid adc_code %x\n", adc_code);
453453
return -EIO;
454454
}
455455

0 commit comments

Comments
 (0)