From d01b91e2c0938344bea9e47ea7ce473a2f3aabc2 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Mon, 5 Jul 2010 18:53:37 -0400 Subject: [PATCH] --- yaml --- r: 205205 b: refs/heads/master c: 4d1f9082251a835ea387b47bb9dd26980bf8e0d0 h: refs/heads/master i: 205203: 3e0fdd81e43850873bef531af025fe01a12fafcc v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 25ba346cbcec..47afb6c18f16 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f9e4d16c5b6f627670f1641b3f288d16d84b202 +refs/heads/master: 4d1f9082251a835ea387b47bb9dd26980bf8e0d0 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index eefb948f0632..a0a4d6968400 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -4209,22 +4209,16 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "OCZ CORE_SSD", "02.10104", ATA_HORKAGE_NONCQ }, /* Seagate NCQ + FLUSH CACHE firmware bug */ - { "ST31500341AS", "SD1[56789]", ATA_HORKAGE_NONCQ | + { "ST31500341AS", "SD1[5-9]", ATA_HORKAGE_NONCQ | ATA_HORKAGE_FIRMWARE_WARN }, - { "ST31000333AS", "SD1[56789]", ATA_HORKAGE_NONCQ | + { "ST31000333AS", "SD1[5-9]", ATA_HORKAGE_NONCQ | ATA_HORKAGE_FIRMWARE_WARN }, - { "ST3640623AS", "SD1[56789]", ATA_HORKAGE_NONCQ | + { "ST3640[36]23AS", "SD1[5-9]", ATA_HORKAGE_NONCQ | ATA_HORKAGE_FIRMWARE_WARN }, - { "ST3640323AS", "SD1[56789]", ATA_HORKAGE_NONCQ | - ATA_HORKAGE_FIRMWARE_WARN }, - - { "ST3320813AS", "SD1[56789]", ATA_HORKAGE_NONCQ | - ATA_HORKAGE_FIRMWARE_WARN }, - - { "ST3320613AS", "SD1[56789]", ATA_HORKAGE_NONCQ | + { "ST3320[68]13AS", "SD1[5-9]", ATA_HORKAGE_NONCQ | ATA_HORKAGE_FIRMWARE_WARN }, /* Blacklist entries taken from Silicon Image 3124/3132