From 1d66222cdba0a25d9e353c7f3b05388c44577f7e Mon Sep 17 00:00:00 2001
From: Chad Dupuis <chad.dupuis@qlogic.com>
Date: Tue, 16 Aug 2011 11:29:26 -0700
Subject: [PATCH] --- yaml --- r: 263799 b: refs/heads/master c:
 bc91ade9b7bc274d625c9b24c04d365a2daf481e h: refs/heads/master i:   263797:
 569ced1133fa85e9b1407495636a02f6da415977   263795:
 cc392660e2d72eb6684147b0520cf611272f2491   263791:
 4adf075712e66684b3afb83a6470ecaa90a810c3 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_os.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9a051452971a..3591db5c5330 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7594206493880007fd68a18d6e9f380a1afe20d4
+refs/heads/master: bc91ade9b7bc274d625c9b24c04d365a2daf481e
diff --git a/trunk/drivers/scsi/qla2xxx/qla_os.c b/trunk/drivers/scsi/qla2xxx/qla_os.c
index 2caab83c4c9f..4cace3f20c04 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_os.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_os.c
@@ -918,6 +918,10 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
 	qla2x00_sp_compl(ha, sp);
 	spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
+	/* Did the command return during mailbox execution? */
+	if (ret == FAILED && !CMD_SP(cmd))
+		ret = SUCCESS;
+
 	/* Wait for the command to be returned. */
 	if (wait) {
 		if (qla2x00_eh_wait_on_command(cmd) != QLA_SUCCESS) {