Commit 2910ca6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ata_piix: add another TECRA M3 entry to broken suspend list
parents d237098c 4c74d4ec

drivers/ata/ata_piix.c

+7 −0
Original line number Diff line number Diff line
@@ -920,6 +920,13 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev) 
static int piix_broken_suspend(void)

{

	static struct dmi_system_id sysids[] = {

		{

			.ident = "TECRA M3",

			.matches = {

				DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),

				DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M3"),

			},

		},

		{

			.ident = "TECRA M5",

			.matches = {