Merge branches 'acpi-ec' and 'acpi-button'

[deliverable/linux.git] / drivers / ata / libata-eh.c

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 5688b86b192decbbcd38abfe701829ede9d3f89c..0e1ec37070d19b641ed37d9a75c216197c0fc557 100644 (file)
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -606,7 +606,7 @@ void ata_scsi_error(struct Scsi_Host *host)
        ata_scsi_port_error_handler(host, ap);
 
        /* finish or retry handled scmd's and clean up */
-       WARN_ON(host->host_failed || !list_empty(&eh_work_q));
+       WARN_ON(!list_empty(&eh_work_q));
 
        DPRINTK("EXIT\n");
 }
@@ -2611,7 +2611,8 @@ static void ata_eh_link_report(struct ata_link *link)
                                [ATA_PROT_NODATA]       = "nodata",
                                [ATA_PROT_PIO]          = "pio",
                                [ATA_PROT_DMA]          = "dma",
-                               [ATA_PROT_NCQ]          = "ncq",
+                               [ATA_PROT_NCQ]          = "ncq dma",
+                               [ATA_PROT_NCQ_NODATA]   = "ncq nodata",
                                [ATAPI_PROT_NODATA]     = "nodata",
                                [ATAPI_PROT_PIO]        = "pio",
                                [ATAPI_PROT_DMA]        = "dma",