Skip to content

Commit ad61873

Browse files
committed
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()
2 parents 120434e + d34af75 commit ad61873

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static const struct dmi_system_id fwbug_list[] = {
2525
.ident = "ROG Zephyrus G14",
2626
.matches = {
2727
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
28-
DMI_MATCH(DMI_PRODUCT_NAME, "GA403UV"),
28+
DMI_MATCH(DMI_PRODUCT_NAME, "GA403U"),
2929
},
3030
.driver_data = &quirk_no_sps_bug,
3131
},

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,10 @@ static int __init dell_smbios_init(void)
622622
return 0;
623623

624624
fail_sysfs:
625-
free_group(platform_device);
625+
if (!wmi)
626+
exit_dell_smbios_wmi();
627+
if (!smm)
628+
exit_dell_smbios_smm();
626629

627630
fail_create_group:
628631
platform_device_del(platform_device);

0 commit comments

Comments
 (0)