2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 3c6ad7d949c1..8d64f8fd8f1d 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1878,7 +1878,9 @@ static void ata_eh_link_report(struct ata_link *link)
         for (tag = 0; tag < ATA_MAX_QUEUE; tag++) {
                 struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);
 
-                if (!(qc->flags & ATA_QCFLAG_FAILED) || qc->dev->link != link)
+                if (!(qc->flags & ATA_QCFLAG_FAILED) || qc->dev->link != link ||
+                    ((qc->flags & ATA_QCFLAG_QUIET) &&
+                     qc->err_mask == AC_ERR_DEV))
                         continue;
                 if (qc->flags & ATA_QCFLAG_SENSE_VALID && !qc->err_mask)
                         continue;
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 6ef5ecb917ce..fc89590d3772 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -2767,8 +2767,8 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)
          */
         qc->nbytes = scsi_bufflen(scmd);
 
-        /* request result TF */
-        qc->flags |= ATA_QCFLAG_RESULT_TF;
+        /* request result TF and be quiet about device error */
+        qc->flags |= ATA_QCFLAG_RESULT_TF | ATA_QCFLAG_QUIET;
 
         return 0;