github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-12 16:18:45 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

platform-drivers-x86 for v7.1-2

Browse Source 
Fixes
 
 - hp-wmi: silence unknown board warning for 8D41
 
 - lenovo/wmi-other: Fix uninitialized variable in fan RPM handling
 
 - wmi: Check min_size also when ACPI does not return an out object
 
 The following is an automated shortlog grouped by driver:
 
 hp-wmi:
  -  silence unknown board warning for 8D41
 
 lenovo: wmi-other:
  -  Fix uninitialized variable in lwmi_om_hwmon_write()
 
 wmi:
  -  Fix unchecked min_size in wmidev_invoke_method()
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQSCSUwRdwTNL2MhaBlZrE9hU+XOMQUCafx4pgAKCRBZrE9hU+XO
 MerAAP9ALfDumabgsXGDibvB5700w4oXxKpf+NS/O0RGlKSpigD/bvo4xIut5Qow
 xYZfEhYkRUyd0bSQwYh5i7fS8am7Nw8=
 =Lais
 -----END PGP SIGNATURE-----

Merge tag 'platform-drivers-x86-v7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Ilpo Järvinen:

 - Silence unknown board warning for 8D41 (hp-wmi)

 - Fix uninitialized variable in fan RPM handling (lenovo/wmi-other)

 - Check min_size also when ACPI does not return an out object (wmi)

* tag 'platform-drivers-x86-v7.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: lenovo: wmi-other: Fix uninitialized variable in lwmi_om_hwmon_write()
  platform/x86: hp-wmi: silence unknown board warning for 8D41
  platform/wmi: Fix unchecked min_size in wmidev_invoke_method()
This commit is contained in:
Linus Torvalds 2026-05-07 08:46:27 -07:00
commit 1e38f888f9
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/platform/wmi/core.c
View File

@ -411,6 +411,9 @@ int wmidev_invoke_method(struct wmi_device *wdev, u8 instance, u32 method_id,
obj = aout.pointer;
if (!obj) {
if (min_size != 0)
return -ENOMSG;
out->length = 0;
out->data = ZERO_SIZE_PTR;

2
drivers/platform/x86/hp/hp-wmi.c
View File

@ -243,7 +243,7 @@ static const struct dmi_system_id victus_s_thermal_profile_boards[] __initconst
},
{
.matches = { DMI_MATCH(DMI_BOARD_NAME, "8D41") },
.driver_data = (void *)&victus_s_thermal_params,
.driver_data = (void *)&omen_v1_no_ec_thermal_params,
},
{
.matches = { DMI_MATCH(DMI_BOARD_NAME, "8D87") },

2
drivers/platform/x86/lenovo/wmi-other.c
View File

@ -349,6 +349,8 @@ static int lwmi_om_hwmon_write(struct device *dev, enum hwmon_sensor_types type,
*/
if (!relax_fan_constraint)
raw = val / LWMI_FAN_DIV * LWMI_FAN_DIV;
else
raw = val;
err = lwmi_om_fan_get_set(priv, channel, &raw, true);
if (err)