Commit 1e38f888 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v7.1-2' of... 

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()
parents b3737eac 863810d4

drivers/platform/wmi/core.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

drivers/platform/x86/hp/hp-wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -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") },

drivers/platform/x86/lenovo/wmi-other.c

+2 −0
Original line number Diff line number Diff line
@@ -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)