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_promise.c | |
parent | b4d28889f7ebfe498dedaceb773b4c785b97d195 (diff) | |
parent | a72ec4ce6d3ae92e76baf5b2c65cc26e5e775e83 (diff) | |
download | linux-3.10-7103c7bc863c10dd2a26c19c8cf4d7d2846da947.tar.gz linux-3.10-7103c7bc863c10dd2a26c19c8cf4d7d2846da947.tar.bz2 linux-3.10-7103c7bc863c10dd2a26c19c8cf4d7d2846da947.zip |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/sata_promise.c')
-rw-r--r-- | drivers/scsi/sata_promise.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 010e0881988..760c56f7163 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c @@ -401,21 +401,12 @@ static void pdc_eng_timeout(struct ata_port *ap) goto out; } - /* 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. - */ - qc->scsidone = scsi_finish_command; - switch (qc->tf.protocol) { case ATA_PROT_DMA: case ATA_PROT_NODATA: printk(KERN_ERR "ata%u: command timeout\n", ap->id); drv_stat = ata_wait_idle(ap); qc->err_mask |= __ac_err_mask(drv_stat); - ata_qc_complete(qc); break; default: @@ -425,12 +416,13 @@ static void pdc_eng_timeout(struct ata_port *ap) ap->id, qc->tf.command, drv_stat); qc->err_mask |= ac_err_mask(drv_stat); - ata_qc_complete(qc); break; } out: spin_unlock_irqrestore(&host_set->lock, flags); + if (qc) + ata_eh_qc_complete(qc); DPRINTK("EXIT\n"); } |