]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
platform/x86: asus-wmi: don't fail if platform_profile already registered
authorLuke D. Jones <luke@ljones.dev>
Tue, 10 Sep 2024 04:54:43 +0000 (16:54 +1200)
committerHans de Goede <hdegoede@redhat.com>
Wed, 11 Sep 2024 12:31:18 +0000 (14:31 +0200)
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>
drivers/platform/x86/asus-wmi.c

index ed9d5d7fd1444f7d8e5e08371fafeb0838c37018..6ae282088408414b6ed7a300182f028f795febe1 100644 (file)
@@ -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;