diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:39:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:39:25 -0500 |
| commit | 7103c7bc863c10dd2a26c19c8cf4d7d2846da947 (patch) | |
| tree | 73a9d674670c37e4f160c0d4553f3d14664900be /drivers/scsi/sata_mv.c | |
| parent | b4d28889f7ebfe498dedaceb773b4c785b97d195 (diff) | |
| parent | a72ec4ce6d3ae92e76baf5b2c65cc26e5e775e83 (diff) | |
| download | op-kernel-dev-7103c7bc863c10dd2a26c19c8cf4d7d2846da947.zip op-kernel-dev-7103c7bc863c10dd2a26c19c8cf4d7d2846da947.tar.gz | |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index 498d628..0042c78 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c @@ -1838,7 +1838,6 @@ static void mv_phy_reset(struct ata_port *ap) static void mv_eng_timeout(struct ata_port *ap) { struct ata_queued_cmd *qc; - unsigned long flags; printk(KERN_ERR "ata%u: Entering mv_eng_timeout\n",ap->id); DPRINTK("All regs @ start of eng_timeout\n"); @@ -1857,17 +1856,8 @@ static void mv_eng_timeout(struct ata_port *ap) printk(KERN_ERR "ata%u: BUG: timeout without command\n", ap->id); } else { - /* hack alert! We cannot use the supplied completion - * function from inside the ->eh_strategy_handler() thread. - * libata is the only user of ->eh_strategy_handler() in - * any kernel, so the default scsi_done() assumes it is - * not being called from the SCSI EH. - */ - spin_lock_irqsave(&ap->host_set->lock, flags); - qc->scsidone = scsi_finish_command; qc->err_mask |= AC_ERR_TIMEOUT; - ata_qc_complete(qc); - spin_unlock_irqrestore(&ap->host_set->lock, flags); + ata_eh_qc_complete(qc); } } |
