platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading
authorHans de Goede <hdegoede@redhat.com>
Sat, 17 Sep 2022 21:04:07 +0000 (23:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 10:35:40 +0000 (12:35 +0200)
[ Upstream commit 2a2565272a3628e45d61625e36ef17af7af4e3de ]

On a MSI S270 with Fedora 37 x86_64 / systemd-251.4 the module does not
properly autoload.

This is likely caused by issues with how systemd-udevd handles the single
quote char (') which is part of the sys_vendor / chassis_vendor strings
on this laptop. As a workaround remove the single quote char + everything
behind it from the sys_vendor + chassis_vendor matches. This fixes
the module not autoloading.

Link: https://github.com/systemd/systemd/issues/24715
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220917210407.647432-1-hdegoede@redhat.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/platform/x86/msi-laptop.c

index 3e93530..0e804b6 100644 (file)
@@ -596,11 +596,10 @@ static const struct dmi_system_id msi_dmi_table[] __initconst = {
        {
                .ident = "MSI S270",
                .matches = {
-                       DMI_MATCH(DMI_SYS_VENDOR, "MICRO-STAR INT'L CO.,LTD"),
+                       DMI_MATCH(DMI_SYS_VENDOR, "MICRO-STAR INT"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "MS-1013"),
                        DMI_MATCH(DMI_PRODUCT_VERSION, "0131"),
-                       DMI_MATCH(DMI_CHASSIS_VENDOR,
-                                 "MICRO-STAR INT'L CO.,LTD")
+                       DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR INT")
                },
                .driver_data = &quirk_old_ec_model,
                .callback = dmi_check_cb
@@ -633,8 +632,7 @@ static const struct dmi_system_id msi_dmi_table[] __initconst = {
                        DMI_MATCH(DMI_SYS_VENDOR, "NOTEBOOK"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "SAM2000"),
                        DMI_MATCH(DMI_PRODUCT_VERSION, "0131"),
-                       DMI_MATCH(DMI_CHASSIS_VENDOR,
-                                 "MICRO-STAR INT'L CO.,LTD")
+                       DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR INT")
                },
                .driver_data = &quirk_old_ec_model,
                .callback = dmi_check_cb