diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:36:14 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:36:14 -0500 |
| commit | 7dfb869c8e45e5863534f38fdac990829b22964a (patch) | |
| tree | f36bbdba46b022356d05ac26d5073e395d2f8abd /drivers/scsi/ahci.c | |
| parent | 628e386e27674906326455f01d87878a5f0cbce7 (diff) | |
| parent | 11a56d2439259892319df81cf1582687d7e7fde5 (diff) | |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/ahci.c')
| -rw-r--r-- | drivers/scsi/ahci.c | 4 |
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); } } |