diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-02 10:34:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-02 10:34:24 -0400 |
| commit | c13b56a1130bbfacfb588de100e5a248383805a6 (patch) | |
| tree | 7f10fbcb822fe50225a3ae6f4644775b72c6290c /drivers/scsi/libata-eh.c | |
| parent | 029f5468b5b5f93a09bf90326fdcb9124079658d (diff) | |
| download | lwn-c13b56a1130bbfacfb588de100e5a248383805a6.tar.gz lwn-c13b56a1130bbfacfb588de100e5a248383805a6.zip | |
[libata] irq-pio: Fix merge mistake
Diffstat (limited to 'drivers/scsi/libata-eh.c')
| -rw-r--r-- | drivers/scsi/libata-eh.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c index e73f5612aea8..011e083b19e1 100644 --- a/drivers/scsi/libata-eh.c +++ b/drivers/scsi/libata-eh.c @@ -137,6 +137,7 @@ int ata_scsi_error(struct Scsi_Host *host) * LOCKING: * Inherited from SCSI layer (none, can sleep) */ + static void ata_qc_timeout(struct ata_queued_cmd *qc) { struct ata_port *ap = qc->ap; @@ -171,8 +172,10 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc) printk(KERN_ERR "ata%u: command 0x%x timeout, stat 0x%x host_stat 0x%x\n", ap->id, qc->tf.command, drv_stat, host_stat); + ap->hsm_task_state = HSM_ST_IDLE; + /* complete taskfile transaction */ - qc->err_mask |= ac_err_mask(drv_stat); + qc->err_mask |= AC_ERR_TIMEOUT; break; } |