1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 30676b0eb366..bb3686ae1885 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -680,7 +680,7 @@ static void ahci_eng_timeout(struct ata_port *ap)
                  * not being called from the SCSI EH.
                  */
                 qc->scsidone = scsi_finish_command;
-                qc->err_mask |= AC_ERR_OTHER;
+                qc->err_mask |= AC_ERR_TIMEOUT;
                 ata_qc_complete(qc);
         }
 
@@ -721,7 +721,7 @@ static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)
                 ahci_restart_port(ap, status);
 
                 if (qc) {
-                        qc->err_mask |= AC_ERR_OTHER;
+                        qc->err_mask |= err_mask;
                         ata_qc_complete(qc);
                 }
         }