UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[libata] irq-pio: fix breakage related to err_mask merge

This commit is contained in:
Jeff Garzik 2005-12-06 05:01:27 -05:00
parent 701db69d66
commit 278efe9509
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/libata-core.c
View File

@ -4336,7 +4336,8 @@ fsm_start:
ap->id, status, host_stat); ap->id, status, host_stat);
ap->hsm_task_state = HSM_ST_IDLE; 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; break;
default: default:
goto idle_irq; goto idle_irq;

2
drivers/scsi/sata_mv.c
View File

@ -1244,7 +1244,7 @@ static void mv_host_intr(struct ata_host_set *host_set, u32 relevant,
/* mark qc status appropriately */ /* mark qc status appropriately */
if (!(qc->tf.flags & ATA_TFLAG_POLLING)) { if (!(qc->tf.flags & ATA_TFLAG_POLLING)) {
qc->err_mask |= err_mask; qc->err_mask |= err_mask;
ata_qc_complete(qc, err_mask); ata_qc_complete(qc);
} }
} }
} }