diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 05:01:27 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-06 05:01:27 -0500 |
| commit | 278efe950988e72e2d0cea35059438fc27035d13 (patch) | |
| tree | 76096041fa7eeb2b6ecd5dcc8207012952d2bbc2 /drivers | |
| parent | 701db69d6647f61e4660c9102d7f2fd5dffc203d (diff) | |
| download | blackbird-op-linux-278efe950988e72e2d0cea35059438fc27035d13.tar.gz blackbird-op-linux-278efe950988e72e2d0cea35059438fc27035d13.zip | |
[libata] irq-pio: fix breakage related to err_mask merge
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/libata-core.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/sata_mv.c | 2 |
2 files changed, 3 insertions, 2 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; diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index ef148acb5eeb..17044168ebfe 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c @@ -1244,7 +1244,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant, /* mark qc status appropriately */ if (!(qc->tf.flags & ATA_TFLAG_POLLING)) { qc->err_mask |= err_mask; - ata_qc_complete(qc, err_mask); + ata_qc_complete(qc); } } } |
