net: phy: dp83848: add dp83822 PHY support

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

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index c6f0174..0e1ec37 100644 (file)
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2607,9 +2607,13 @@ static void ata_eh_link_report(struct ata_link *link)
                                [DMA_FROM_DEVICE]       = "in",
                        };
                        static const char *prot_str[] = {
+                               [ATA_PROT_UNKNOWN]      = "unknown",
+                               [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",
                        };
@@ -3177,7 +3181,7 @@ static void ata_eh_park_issue_cmd(struct ata_device *dev, int park)
        }
 
        tf.flags |= ATA_TFLAG_DEVICE | ATA_TFLAG_ISADDR;
-       tf.protocol |= ATA_PROT_NODATA;
+       tf.protocol = ATA_PROT_NODATA;
        err_mask = ata_exec_internal(dev, &tf, NULL, DMA_NONE, NULL, 0, 0);
        if (park && (err_mask || tf.lbal != 0xc4)) {
                ata_dev_err(dev, "head unload failed!\n");