diff options
| author | Tejun Heo <htejun@gmail.com> | 2006-05-15 20:59:15 +0900 |
|---|---|---|
| committer | Tejun Heo <htejun@gmail.com> | 2006-05-15 20:59:15 +0900 |
| commit | 12436c30f4808e00fa008c6787c609bc6ae216ba (patch) | |
| tree | 22ddaad8def4f4a77637a3da62a8d8f422a95c29 /drivers/scsi/libata-eh.c | |
| parent | 88ce7550c38f46c8697f53727a571bf838bee398 (diff) | |
| parent | 7894eaf291238a62a565e9e9777483beeb00eeae (diff) | |
| download | kernel_samsung_smdk4412-12436c30f4808e00fa008c6787c609bc6ae216ba.tar.gz kernel_samsung_smdk4412-12436c30f4808e00fa008c6787c609bc6ae216ba.tar.bz2 kernel_samsung_smdk4412-12436c30f4808e00fa008c6787c609bc6ae216ba.zip | |
Merge branch 'irq-pio'
Conflicts:
drivers/scsi/libata-core.c
include/linux/libata.h
Diffstat (limited to 'drivers/scsi/libata-eh.c')
| -rw-r--r-- | drivers/scsi/libata-eh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c index cd133f83e59..e401f353f84 100644 --- a/drivers/scsi/libata-eh.c +++ b/drivers/scsi/libata-eh.c @@ -350,7 +350,7 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc) qc->tf.command, drv_stat, host_stat); /* complete taskfile transaction */ - qc->err_mask |= ac_err_mask(drv_stat); + qc->err_mask |= AC_ERR_TIMEOUT; break; } |