1 files changed, 20 insertions, 16 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 11c9aea4f4f..e0bda9ff89c 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -4125,6 +4125,8 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = {
          * device and controller are SATA.
          */
         { "PIONEER DVD-RW  DVRTD08",    NULL,   ATA_HORKAGE_NOSETXFER },
+        { "PIONEER DVD-RW  DVRTD08A",   NULL,   ATA_HORKAGE_NOSETXFER },
+        { "PIONEER DVD-RW  DVR-215",    NULL,   ATA_HORKAGE_NOSETXFER },
         { "PIONEER DVD-RW  DVR-212D",   NULL,   ATA_HORKAGE_NOSETXFER },
         { "PIONEER DVD-RW  DVR-216D",   NULL,   ATA_HORKAGE_NOSETXFER },
 
@@ -5934,29 +5936,31 @@ void ata_host_init(struct ata_host *host, struct device *dev,
         host->ops = ops;
 }
 
-int ata_port_probe(struct ata_port *ap)
+void __ata_port_probe(struct ata_port *ap)
 {
-        int rc = 0;
+        struct ata_eh_info *ehi = &ap->link.eh_info;
+        unsigned long flags;
 
-        /* probe */
-        if (ap->ops->error_handler) {
-                struct ata_eh_info *ehi = &ap->link.eh_info;
-                unsigned long flags;
+        /* kick EH for boot probing */
+        spin_lock_irqsave(ap->lock, flags);
 
-                /* kick EH for boot probing */
-                spin_lock_irqsave(ap->lock, flags);
+        ehi->probe_mask |= ATA_ALL_DEVICES;
+        ehi->action |= ATA_EH_RESET;
+        ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
 
-                ehi->probe_mask |= ATA_ALL_DEVICES;
-                ehi->action |= ATA_EH_RESET;
-                ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;
+        ap->pflags &= ~ATA_PFLAG_INITIALIZING;
+        ap->pflags |= ATA_PFLAG_LOADING;
+        ata_port_schedule_eh(ap);
 
-                ap->pflags &= ~ATA_PFLAG_INITIALIZING;
-                ap->pflags |= ATA_PFLAG_LOADING;
-                ata_port_schedule_eh(ap);
+        spin_unlock_irqrestore(ap->lock, flags);
+}
 
-                spin_unlock_irqrestore(ap->lock, flags);
+int ata_port_probe(struct ata_port *ap)
+{
+        int rc = 0;
 
-                /* wait for EH to finish */
+        if (ap->ops->error_handler) {
+                __ata_port_probe(ap);
                 ata_port_wait_eh(ap);
         } else {
                 DPRINTK("ata%u: bus probe begin\n", ap->print_id);