summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke D. Jones <luke@ljones.dev>2024-09-10 16:54:43 +1200
committerHans de Goede <hdegoede@redhat.com>2024-09-11 14:31:18 +0200
commit8e8895c9dc81a7fdbeb15adb394139e79f5281b6 (patch)
tree53d9805ff0444e1875dcf47163649d267b5d0a1a
parentf965e5bf656984c594e9010f1bb54a6de4c48e7b (diff)
platform/x86: asus-wmi: don't fail if platform_profile already registered
On some newer laptops ASUS laptops SPS support is advertised but not actually used, causing the AMD driver to register as a platform_profile handler. If this happens then the asus_wmi driver would error with -EEXIST when trying to register its own handler leaving the user with a possibly unusable system. This is especially true for laptops with an MCU that emit a stream of HID packets, some of which can be misinterpreted as shutdown signals. We can safely continue loading the driver instead of bombing out. Signed-off-by: Luke D. Jones <luke@ljones.dev> Link: https://lore.kernel.org/r/20240910045443.678145-1-luke@ljones.dev Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-rw-r--r--drivers/platform/x86/asus-wmi.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
index ed9d5d7fd144..6ae282088408 100644
--- a/drivers/platform/x86/asus-wmi.c
+++ b/drivers/platform/x86/asus-wmi.c
@@ -3910,8 +3910,13 @@ static int platform_profile_setup(struct asus_wmi *asus)
asus->platform_profile_handler.choices);
err = platform_profile_register(&asus->platform_profile_handler);
- if (err)
+ if (err == -EEXIST) {
+ pr_warn("%s, a platform_profile handler is already registered\n", __func__);
+ return 0;
+ } else if (err) {
+ pr_err("%s, failed at platform_profile_register: %d\n", __func__, err);
return err;
+ }
asus->platform_profile_support = true;
return 0;