Re: [PATCH] platform/x86: msi-laptop: Change DMI match / alias strings to fix module autoloading

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On 9/17/22 22:04, Hans de Goede wrote:
> 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@xxxxxxxxxx>

I have added this to my review-hans branch now.

Regards,

Hans


> ---
>  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 1c29678e5727..2f850396e9a7 100644
> --- a/drivers/platform/x86/msi-laptop.c
> +++ b/drivers/platform/x86/msi-laptop.c
> @@ -602,11 +602,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
> @@ -639,8 +638,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




[Index of Archives]     [Linux Kernel Development]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux