diff options
| author | Ilpo Järvinen <[email protected]> | 2025-01-20 12:22:06 +0000 |
|---|---|---|
| committer | Ilpo Järvinen <[email protected]> | 2025-01-21 12:00:38 +0000 |
| commit | 0da9a3f9ac8ada83fa79579455871ec59f11db72 (patch) | |
| tree | 48a22c56221b8c9b3639cf132330117baf2c5181 /drivers/platform/x86/asus-wmi.c | |
| parent | platform/x86: acer-wmi: Fix initialization of last_non_turbo_profile (diff) | |
| parent | platform/x86: lenovo-yoga-tab2-pro-1380-fastcharger: fix serdev race (diff) | |
| download | kernel-0da9a3f9ac8ada83fa79579455871ec59f11db72.tar.gz kernel-0da9a3f9ac8ada83fa79579455871ec59f11db72.zip | |
Merge branch 'fixes' into 'for-next'
Merged the 'fixes' branch into the 'for-next' branch to resolve
a conflict in alienware-wmi zone teardown code.
Diffstat (limited to 'drivers/platform/x86/asus-wmi.c')
| -rw-r--r-- | drivers/platform/x86/asus-wmi.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 1032c0e84e3d..38ef778e8c19 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -3696,7 +3696,6 @@ static int asus_wmi_custom_fan_curve_init(struct asus_wmi *asus) /* Throttle thermal policy ****************************************************/ static int throttle_thermal_policy_write(struct asus_wmi *asus) { - u32 retval; u8 value; int err; @@ -3718,8 +3717,8 @@ static int throttle_thermal_policy_write(struct asus_wmi *asus) value = asus->throttle_thermal_policy_mode; } - err = asus_wmi_set_devstate(asus->throttle_thermal_policy_dev, - value, &retval); + /* Some machines do not return an error code as a result, so we ignore it */ + err = asus_wmi_set_devstate(asus->throttle_thermal_policy_dev, value, NULL); sysfs_notify(&asus->platform_device->dev.kobj, NULL, "throttle_thermal_policy"); @@ -3729,12 +3728,6 @@ static int throttle_thermal_policy_write(struct asus_wmi *asus) return err; } - if (retval != 1) { - pr_warn("Failed to set throttle thermal policy (retval): 0x%x\n", - retval); - return -EIO; - } - /* Must set to disabled if mode is toggled */ if (asus->cpu_fan_curve_available) asus->custom_fan_curves[FAN_CURVE_DEV_CPU].enabled = false; |