--- libata-core.c_org	2007-06-20 12:56:45.000000000 +0200
+++ libata-core.c_patched	2007-06-20 13:37:31.000000000 +0200
@@ -3362,6 +3362,7 @@ static const struct ata_blacklist_entry 
 	/* Weird ATAPI devices */
 	{ "TORiSAN DVD-ROM DRD-N216", NULL,	ATA_HORKAGE_MAX_SEC_128 |
 						ATA_HORKAGE_DMA_RW_ONLY },
+	{ "PLEXTOR DVD-ROM PX-130A", NULL,	ATA_HORKAGE_DMA_RW_ONLY },
 
 	/* Devices we expect to fail diagnostics */
 
@@ -3379,11 +3380,14 @@ static const struct ata_blacklist_entry 
 	{ "HTS541060G9SA00",    "MB3OC60D",     ATA_HORKAGE_NONCQ, },
 	{ "HTS541080G9SA00",    "MB4OC60D",     ATA_HORKAGE_NONCQ, },
 	{ "HTS541010G9SA00",    "MBZOC60D",     ATA_HORKAGE_NONCQ, },
-
+	/* Drives which do spurious command completion */
+	{ "HTS541612J9SA00",	"SBDIC7JP",	ATA_HORKAGE_NONCQ, },
+	{ "WDC WD740ADFD-00NLR1", NULL,		ATA_HORKAGE_NONCQ, },
+	
 	/* Devices with NCQ limits */
 
 	/* End Marker */
-	{ }
+	{ }ata_device_blacklist
 };
 
 unsigned long ata_device_blacklisted(const struct ata_device *dev)