Merge tag 'ata-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux

torvalds · torvalds · commit 9c7331f15054 · 2025-06-27T08:30:37.000-07:00
Pull ata fix from Niklas Cassel:

 - Use the correct DMI identifier for ASUSPRO-D840SA LPM quirk such that
   the quirk actually gets applied (me)

* tag 'ata-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux:
  ata: ahci: Use correct DMI identifier for ASUSPRO-D840SA LPM quirk
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
@@ -1450,7 +1450,7 @@ static bool ahci_broken_lpm(struct pci_dev *pdev)
 		{
 			.matches = {
 				DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
-				DMI_MATCH(DMI_PRODUCT_VERSION, "ASUSPRO D840MB_M840SA"),
+				DMI_MATCH(DMI_PRODUCT_NAME, "ASUSPRO D840MB_M840SA"),
 			},
 			/* 320 is broken, there is no known good version. */
 		},

Original file line number	Diff line number	Diff line change
`@@ -1450,7 +1450,7 @@ static bool ahci_broken_lpm(struct pci_dev *pdev)`
`1450`	`1450`	`{`
`1451`	`1451`	`.matches = {`
`1452`	`1452`	`DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),`
`1453`		`- DMI_MATCH(DMI_PRODUCT_VERSION, "ASUSPRO D840MB_M840SA"),`
	`1453`	`+ DMI_MATCH(DMI_PRODUCT_NAME, "ASUSPRO D840MB_M840SA"),`
`1454`	`1454`	`},`
`1455`	`1455`	`/* 320 is broken, there is no known good version. */`
`1456`	`1456`	`},`