diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 04:50:22 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 04:50:22 -0500 |
| commit | 054ee8fd39f1b5d50e803f126b63f400d631eea4 (patch) | |
| tree | 2819e388f853de88e09635de8e38017b563069bc /drivers/scsi/ahci.c | |
| parent | f0612bbc41f65f5a684f69d714a1a17a6f0f40c5 (diff) | |
| parent | a7dac447bb9cef27d4d29cdf63e2d7809c50b1f4 (diff) | |
Merge branch 'upstream'
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 3df74a08fe2..25a47d7afa2 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c @@ -608,7 +608,7 @@ static void ahci_eng_timeout(struct ata_port *ap) * not being called from the SCSI EH. */ qc->scsidone = scsi_finish_command; - ata_qc_complete(qc, ATA_ERR); + ata_qc_complete(qc, AC_ERR_OTHER); } spin_unlock_irqrestore(&host_set->lock, flags); @@ -637,7 +637,7 @@ static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc) if (status & PORT_IRQ_FATAL) { ahci_intr_error(ap, status); if (qc) - ata_qc_complete(qc, ATA_ERR); + ata_qc_complete(qc, AC_ERR_OTHER); } return 1; |