summaryrefslogtreecommitdiff
path: root/drivers/scsi/libata-core.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-06 05:01:27 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-06 05:01:27 -0500
commit278efe950988e72e2d0cea35059438fc27035d13 (patch)
tree76096041fa7eeb2b6ecd5dcc8207012952d2bbc2 /drivers/scsi/libata-core.c
parent701db69d6647f61e4660c9102d7f2fd5dffc203d (diff)
downloadlwn-278efe950988e72e2d0cea35059438fc27035d13.tar.gz
lwn-278efe950988e72e2d0cea35059438fc27035d13.zip
[libata] irq-pio: fix breakage related to err_mask merge
Diffstat (limited to 'drivers/scsi/libata-core.c')
-rw-r--r--drivers/scsi/libata-core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 82f566cf75c6..657537f96c3a 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4336,7 +4336,8 @@ fsm_start:
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;