From d9f9d10ad4c9ad00df20ce9ebb5d42d42eca41dc Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Tue, 8 May 2012 09:08:02 -0400 Subject: [PATCH] --- yaml --- r: 305872 b: refs/heads/master c: d70e551c8e1ecb6f20422f8db6bfe6a0049edcb8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2217248ec104..ddd2fbddfe9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47ee9108c1dcca434f479e9e520789d2a2ab7917 +refs/heads/master: d70e551c8e1ecb6f20422f8db6bfe6a0049edcb8 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index d31ee557b395..cece3a4d11ea 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -4057,6 +4057,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "_NEC DV5800A", NULL, ATA_HORKAGE_NODMA }, { "SAMSUNG CD-ROM SN-124", "N001", ATA_HORKAGE_NODMA }, { "Seagate STT20000A", NULL, ATA_HORKAGE_NODMA }, + { "2GB ATA Flash Disk", "ADMA428M", ATA_HORKAGE_NODMA }, /* Odd clown on sil3726/4726 PMPs */ { "Config Disk", NULL, ATA_HORKAGE_DISABLE },