Commit ad618736 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.11-6' of... 

Merge tag 'platform-drivers-x86-v6.11-6' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver fixes from Ilpo Järvinen:

 - amd/pmf: ASUS GA403 quirk matching tweak

 - dell-smbios: Fix to the init function rollback path

* tag 'platform-drivers-x86-v6.11-6' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86/amd: pmf: Make ASUS GA403 quirk generic
  platform/x86: dell-smbios: Fix error path in dell_smbios_init()
parents 120434e5 d34af755

drivers/platform/x86/amd/pmf/pmf-quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static const struct dmi_system_id fwbug_list[] = { 
		.ident = "ROG Zephyrus G14",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "GA403UV"),

			DMI_MATCH(DMI_PRODUCT_NAME, "GA403U"),

		},

		.driver_data = &quirk_no_sps_bug,

	},

drivers/platform/x86/dell/dell-smbios-base.c

+4 −1
Original line number Diff line number Diff line
@@ -622,7 +622,10 @@ static int __init dell_smbios_init(void) 
	return 0;



fail_sysfs:

	free_group(platform_device);

	if (!wmi)

		exit_dell_smbios_wmi();

	if (!smm)

		exit_dell_smbios_smm();



fail_create_group:

	platform_device_del(platform_device);