lkml.org 
[lkml]   [2022]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 216/255] platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading
    Date
    From: Hans de Goede <hdegoede@redhat.com>

    [ 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 | 8 +++-----
    1 file changed, 3 insertions(+), 5 deletions(-)

    diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
    index 3e935303b143..0e804b6c2d24 100644
    --- a/drivers/platform/x86/msi-laptop.c
    +++ b/drivers/platform/x86/msi-laptop.c
    @@ -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
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-24 18:21    [W:4.158 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site