Merge branch 'tmp'

[linux-2.6-omap-h63xx.git] / drivers / scsi / sata_sx4.c

diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c
index db08a8ba9ea74607c26193dc553dc0ce70cfc898..c3975fada63f1d1f07ce379df38f81b623d06a45 100644 (file)
--- a/drivers/scsi/sata_sx4.c
+++ b/drivers/scsi/sata_sx4.c
@@ -872,20 +872,11 @@ 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);
                qc->err_mask |= __ac_err_mask(ata_wait_idle(ap));
-               ata_qc_complete(qc);
                break;
 
        default:
@@ -895,12 +886,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");
 }