Merge branch 'tmp'

1 files changed, 2 insertions, 10 deletions

diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c
index 010e08819886..760c56f71632 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");
 }