diff options
Diffstat (limited to '0005-asus-wmi-don-t-error-out-if-platform_profile-already.patch')
| -rw-r--r-- | 0005-asus-wmi-don-t-error-out-if-platform_profile-already.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/0005-asus-wmi-don-t-error-out-if-platform_profile-already.patch b/0005-asus-wmi-don-t-error-out-if-platform_profile-already.patch new file mode 100644 index 000000000000..f75f44ac3544 --- /dev/null +++ b/0005-asus-wmi-don-t-error-out-if-platform_profile-already.patch @@ -0,0 +1,43 @@ +From ef1ae89af17538f873cc8a57cf1d2191c85b3801 Mon Sep 17 00:00:00 2001 +From: "Luke D. Jones" <luke@ljones.dev> +Date: Fri, 24 May 2024 10:54:36 +1200 +Subject: [PATCH 05/12] asus-wmi: don't error out if platform_profile already + registered + +Signed-off-by: Luke D. Jones <luke@ljones.dev> +--- + drivers/platform/x86/asus-wmi.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c +index 02a97301ca2e..d59886f714b2 100644 +--- a/drivers/platform/x86/asus-wmi.c ++++ b/drivers/platform/x86/asus-wmi.c +@@ -3824,8 +3824,14 @@ static int platform_profile_setup(struct asus_wmi *asus) + asus->platform_profile_handler.choices); + + err = platform_profile_register(&asus->platform_profile_handler); +- if (err) ++ switch (err) { ++ case -EEXIST: ++ pr_warn("%s, a platform_profile handler is already registered\n", __func__); ++ return 0; ++ default: ++ pr_err("%s, failed at platform_profile_register: %d\n", __func__, err); + return err; ++ } + + asus->platform_profile_support = true; + return 0; +@@ -4701,7 +4707,7 @@ static int asus_wmi_add(struct platform_device *pdev) + throttle_thermal_policy_set_default(asus); + + err = platform_profile_setup(asus); +- if (err) ++ if (err && err != -EEXIST) + goto fail_platform_profile_setup; + + err = asus_wmi_sysfs_init(asus->platform_device); +-- +2.45.1 + |