korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 04:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

hwmon fixes for v6.10-rc2

Browse Source 
* 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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEiHPvMQj9QTOCiqgVyx8mb86fmYEFAmZaPm4ACgkQyx8mb86f
 mYHTdg//WFJKIfw3flJVP26k3EPvCOZB+uqxK5/5SfyjEObzjzo70h28U3FOv6cw
 /Il27ItPnCVrfKMhppbZSJdMtodVACfZDFp5Un58/6PZ6ldWnMjP82juSeHXzaP+
 gsw0E24IlqK+m48C4hErmAkUkDUkF4a5zGA6BclvNYBIorqGCK9poJqyc5gtXSs8
 WQ32OKcGn9eFaNu/0ac7Z2hn9wWio2qmsTdV8seqsEsHJYUqIdxRxPQOktInDSeh
 0bqLaKbuoLVfCUY9vcCurqmXbN31wsooqk4T/4sYKSZJLGLdI0rftKnkjwdrbw7N
 R0C/lKK+q35Gxh59726bGEWboq+jL5VSc+oNqcySp+tv65eQ5fqNARnsplTDUK0M
 n+fGIiu2TBAIpRzg6fktukcSm7yNJbPod+Ze/3z8MCrCka5A/m5xcX8fmxIo/J2K
 cWjre1oypYJ+bIaWhxURP3bCJcd52XOd4IDJMZDNJR94xzx+UW2baenenTCyQc6a
 oOaBm+nYloHQJ3/7RinG/NsXDLnH/y0uHGouHZzqCCIADScJnwKan4Xzaef8qRu/
 EZZAERwwNJmYp0ZLcCMM24ZwV2CBVhqYwKA0UYkh0kTneY44ELylFl9U6jyjrHOT
 KwlKWU8o2AQ/cP4Mw69z9/yqQ/fh1ktObdvoVc9ZcSxHNAkYO1I=
 =2uun
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-05-31 16:24:11 -07:00
commit 1b907b83ae
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/hwmon/dell-smm-hwmon.c
View File

@ -1545,6 +1545,14 @@ static const struct dmi_system_id i8k_whitelist_fan_control[] __initconst = {
},
.driver_data = (void *)&i8k_fan_control_data[I8K_FAN_30A3_31A3],
},
{
.ident = "Dell G15 5511",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Dell G15 5511"),
},
.driver_data = (void *)&i8k_fan_control_data[I8K_FAN_30A3_31A3],
},
{ }
};

2
drivers/hwmon/intel-m10-bmc-hwmon.c
View File

@ -429,7 +429,7 @@ static const struct m10bmc_sdata n6000bmc_curr_tbl[] = {
};
static const struct m10bmc_sdata n6000bmc_power_tbl[] = {
{ 0x724, 0x0, 0x0, 0x0, 0x0, 1, "Board Power" },
{ 0x724, 0x0, 0x0, 0x0, 0x0, 1000, "Board Power" },
};
static const struct hwmon_channel_info * const n6000bmc_hinfo[] = {

4
drivers/hwmon/ltc2992.c
View File

@ -876,9 +876,11 @@ static int ltc2992_parse_dt(struct ltc2992_state *st)
ret = fwnode_property_read_u32(child, "shunt-resistor-micro-ohms", &val);
if (!ret) {
if (!val)
if (!val) {
fwnode_handle_put(child);
return dev_err_probe(&st->client->dev, -EINVAL,
"shunt resistor value cannot be zero\n");
}
st->r_sense_uohm[addr] = val;
}
}

2
drivers/hwmon/shtc1.c
View File

@ -238,7 +238,7 @@ static int shtc1_probe(struct i2c_client *client)
if (np) {
data->setup.blocking_io = of_property_read_bool(np, "sensirion,blocking-io");
data->setup.high_precision = !of_property_read_bool(np, "sensicon,low-precision");
data->setup.high_precision = !of_property_read_bool(np, "sensirion,low-precision");
} else {
if (client->dev.platform_data)
data->setup = *(struct shtc1_platform_data *)dev->platform_data;