commit | 278efe950988e72e2d0cea35059438fc27035d13 | [log] [tgz] |
---|---|---|
author | Jeff Garzik <jgarzik@pobox.com> | Tue Dec 06 05:01:27 2005 -0500 |
committer | Jeff Garzik <jgarzik@pobox.com> | Tue Dec 06 05:01:27 2005 -0500 |
tree | 76096041fa7eeb2b6ecd5dcc8207012952d2bbc2 | |
parent | 701db69d6647f61e4660c9102d7f2fd5dffc203d [diff] [blame] |
[libata] irq-pio: fix breakage related to err_mask merge
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 82f566c..657537f 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c
@@ -4336,7 +4336,8 @@ ap->id, status, host_stat); ap->hsm_task_state = HSM_ST_IDLE; - ata_qc_complete(qc, status | ATA_ERR); + qc->err_mask |= __ac_err_mask(status); + ata_qc_complete(qc); break; default: goto idle_irq;