tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull hwmon fixes from Guenter Roeck:

- sttcs: Fix property spelling

- intel-m10-bmc-hwmon: Fix multiplier for N6000 board power sensor

- ltc2992: Fix memory leak

- dell-smm: Add Dell G15 5511 to fan control whitelist

* tag 'hwmon-for-v6.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (shtc1) Fix property misspelling
hwmon: (intel-m10-bmc-hwmon) Fix multiplier for N6000 board power sensor
hwmon: (ltc2992) Fix memory leak in ltc2992_parse_dt()
hwmon: (dell-smm) Add Dell G15 5511 to fan control whitelist

Linus Torvalds 1b907b83 b7087cb3

+13 -3
+8
drivers/hwmon/dell-smm-hwmon.c
··· 1545 1545 }, 1546 1546 .driver_data = (void *)&i8k_fan_control_data[I8K_FAN_30A3_31A3], 1547 1547 }, 1548 + { 1549 + .ident = "Dell G15 5511", 1550 + .matches = { 1551 + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), 1552 + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Dell G15 5511"), 1553 + }, 1554 + .driver_data = (void *)&i8k_fan_control_data[I8K_FAN_30A3_31A3], 1555 + }, 1548 1556 { } 1549 1557 }; 1550 1558
+1 -1
drivers/hwmon/intel-m10-bmc-hwmon.c
··· 429 429 }; 430 430 431 431 static const struct m10bmc_sdata n6000bmc_power_tbl[] = { 432 - { 0x724, 0x0, 0x0, 0x0, 0x0, 1, "Board Power" }, 432 + { 0x724, 0x0, 0x0, 0x0, 0x0, 1000, "Board Power" }, 433 433 }; 434 434 435 435 static const struct hwmon_channel_info * const n6000bmc_hinfo[] = {
+3 -1
drivers/hwmon/ltc2992.c
··· 876 876 877 877 ret = fwnode_property_read_u32(child, "shunt-resistor-micro-ohms", &val); 878 878 if (!ret) { 879 - if (!val) 879 + if (!val) { 880 + fwnode_handle_put(child); 880 881 return dev_err_probe(&st->client->dev, -EINVAL, 881 882 "shunt resistor value cannot be zero\n"); 883 + } 882 884 st->r_sense_uohm[addr] = val; 883 885 } 884 886 }
+1 -1
drivers/hwmon/shtc1.c
··· 238 238 239 239 if (np) { 240 240 data->setup.blocking_io = of_property_read_bool(np, "sensirion,blocking-io"); 241 - data->setup.high_precision = !of_property_read_bool(np, "sensicon,low-precision"); 241 + data->setup.high_precision = !of_property_read_bool(np, "sensirion,low-precision"); 242 242 } else { 243 243 if (client->dev.platform_data) 244 244 data->setup = *(struct shtc1_platform_data *)dev->platform_data;