2 files changed, 10 insertions, 8 deletions

diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c
index 0febad4dd75f..ab350504ca5a 100644
--- a/drivers/scsi/aic94xx/aic94xx_scb.c
+++ b/drivers/scsi/aic94xx/aic94xx_scb.c
@@ -458,13 +458,19 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                 tc_abort = le16_to_cpu(tc_abort);
 
                 list_for_each_entry_safe(a, b, &asd_ha->seq.pend_q, list) {
-                        struct sas_task *task = ascb->uldd_task;
+                        struct sas_task *task = a->uldd_task;
+
+                        if (a->tc_index != tc_abort)
+                                continue;
 
-                        if (task && a->tc_index == tc_abort) {
+                        if (task) {
                                 failed_dev = task->dev;
                                 sas_task_abort(task);
-                                break;
+                        } else {
+                                ASD_DPRINTK("R_T_A for non TASK scb 0x%x\n",
+                                            a->scb->header.opcode);
                         }
+                        break;
                 }
 
                 if (!failed_dev) {
@@ -478,7 +484,7 @@ static void escb_tasklet_complete(struct asd_ascb *ascb,
                  * that the EH will wake up and do something.
                  */
                 list_for_each_entry_safe(a, b, &asd_ha->seq.pend_q, list) {
-                        struct sas_task *task = ascb->uldd_task;
+                        struct sas_task *task = a->uldd_task;
 
                         if (task &&
                             task->dev == failed_dev &&
diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c
index b52124f3d3ac..144f5ad20453 100644
--- a/drivers/scsi/aic94xx/aic94xx_tmf.c
+++ b/drivers/scsi/aic94xx/aic94xx_tmf.c
@@ -151,8 +151,6 @@ static int asd_clear_nexus_I_T(struct domain_device *dev)
         CLEAR_NEXUS_PRE;
         scb->clear_nexus.nexus = NEXUS_I_T;
         scb->clear_nexus.flags = SEND_Q | EXEC_Q | NOTINQ;
-        if (dev->tproto)
-                scb->clear_nexus.flags |= SUSPEND_TX;
         scb->clear_nexus.conn_handle = cpu_to_le16((u16)(unsigned long)
                                                    dev->lldd_dev);
         CLEAR_NEXUS_POST;
@@ -169,8 +167,6 @@ static int asd_clear_nexus_I_T_L(struct domain_device *dev, u8 *lun)
         CLEAR_NEXUS_PRE;
         scb->clear_nexus.nexus = NEXUS_I_T_L;
         scb->clear_nexus.flags = SEND_Q | EXEC_Q | NOTINQ;
-        if (dev->tproto)
-                scb->clear_nexus.flags |= SUSPEND_TX;
         memcpy(scb->clear_nexus.ssp_task.lun, lun, 8);
         scb->clear_nexus.conn_handle = cpu_to_le16((u16)(unsigned long)
                                                    dev->lldd_dev);