From a6127f5476d3f7e0a8ef75a790f7ac8fba444486 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 5 Jul 2007 12:31:31 +0900 Subject: [PATCH] --- yaml --- r: 59073 b: refs/heads/master c: 39ce7128066f2ac5954bcda9f07f429f28166da3 h: refs/heads/master i: 59071: 13ccb5a1a05193825fb3dbf4d87f2f56b1efa67e v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1dd7e1c4879e..2fc57fa90b07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d583bc18812f8da52bf25eef9cd111e5fd46a6ab +refs/heads/master: 39ce7128066f2ac5954bcda9f07f429f28166da3 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 681693534f4f..a00e4ee58b73 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -3740,6 +3740,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "SAMSUNG CD-ROM SN-124","N001", ATA_HORKAGE_NODMA }, { "Seagate STT20000A", NULL, ATA_HORKAGE_NODMA }, { "IOMEGA ZIP 250 ATAPI", NULL, ATA_HORKAGE_NODMA }, /* temporary fix */ + { "IOMEGA ZIP 250 ATAPI Floppy", + NULL, ATA_HORKAGE_NODMA }, /* Weird ATAPI devices */ { "TORiSAN DVD-ROM DRD-N216", NULL, ATA_HORKAGE_MAX_SEC_128 },