From 23e0ec7b6dcb9f52f927f6038a847f542c9a4452 Mon Sep 17 00:00:00 2001
From: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Fri, 18 Nov 2011 09:02:15 -0800
Subject: [PATCH] --- yaml --- r: 276813 b: refs/heads/master c:
 1806fcd5d3d7644511e57b1d0a397837b0b38623 h: refs/heads/master i:   276811:
 f4790b5fd4fd05955f139b895df188162dc43c28 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/scsi/qla2xxx/qla_mbx.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 17cce7dc2307..bc35dd2a977f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3aadff356bb80dae1ebb0a2e68974fdbb39fe034
+refs/heads/master: 1806fcd5d3d7644511e57b1d0a397837b0b38623
diff --git a/trunk/drivers/scsi/qla2xxx/qla_mbx.c b/trunk/drivers/scsi/qla2xxx/qla_mbx.c
index 3b3cec9f6ac2..f965a57f5d65 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_mbx.c
@@ -79,8 +79,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
 		mcp->mb[0] = MBS_LINK_DOWN_ERROR;
 		ql_log(ql_log_warn, base_vha, 0x1004,
 		    "FW hung = %d.\n", ha->flags.isp82xx_fw_hung);
-		rval = QLA_FUNCTION_FAILED;
-		goto premature_exit;
+		return QLA_FUNCTION_TIMEOUT;
 	}
 
 	/*