Skip to content

Commit 1b907b8

Browse files
committed
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
2 parents b7087cb + 52a2c70 commit 1b907b8

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

drivers/hwmon/dell-smm-hwmon.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,6 +1545,14 @@ static const struct dmi_system_id i8k_whitelist_fan_control[] __initconst = {
15451545
},
15461546
.driver_data = (void *)&i8k_fan_control_data[I8K_FAN_30A3_31A3],
15471547
},
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+
},
15481556
{ }
15491557
};
15501558

drivers/hwmon/intel-m10-bmc-hwmon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ static const struct m10bmc_sdata n6000bmc_curr_tbl[] = {
429429
};
430430

431431
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" },
433433
};
434434

435435
static const struct hwmon_channel_info * const n6000bmc_hinfo[] = {

drivers/hwmon/ltc2992.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -876,9 +876,11 @@ static int ltc2992_parse_dt(struct ltc2992_state *st)
876876

877877
ret = fwnode_property_read_u32(child, "shunt-resistor-micro-ohms", &val);
878878
if (!ret) {
879-
if (!val)
879+
if (!val) {
880+
fwnode_handle_put(child);
880881
return dev_err_probe(&st->client->dev, -EINVAL,
881882
"shunt resistor value cannot be zero\n");
883+
}
882884
st->r_sense_uohm[addr] = val;
883885
}
884886
}

drivers/hwmon/shtc1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ static int shtc1_probe(struct i2c_client *client)
238238

239239
if (np) {
240240
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");
242242
} else {
243243
if (client->dev.platform_data)
244244
data->setup = *(struct shtc1_platform_data *)dev->platform_data;

0 commit comments

Comments
 (0)