From ee484e47e0ca2040ad9431cd9f79e61c9e92b5d1 Mon Sep 17 00:00:00 2001
From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Date: Wed, 6 Oct 2010 22:48:24 -0700
Subject: [PATCH] --- yaml --- r: 221454 b: refs/heads/master c:
 884292ecee7148fb8f6297c85b98c54a61d95a20 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/qla4xxx/ql4_os.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5434c41d8903..82e6e46e4995 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f931c5343f4a500552a3b223b1f840e802d5e1e6
+refs/heads/master: 884292ecee7148fb8f6297c85b98c54a61d95a20
diff --git a/trunk/drivers/scsi/qla4xxx/ql4_os.c b/trunk/drivers/scsi/qla4xxx/ql4_os.c
index 6e59b59602a1..56962e52f112 100644
--- a/trunk/drivers/scsi/qla4xxx/ql4_os.c
+++ b/trunk/drivers/scsi/qla4xxx/ql4_os.c
@@ -1966,8 +1966,6 @@ static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha)
 
 		if (adapter_up(ha))
 			return QLA_SUCCESS;
-		else if (ha->retry_reset_ha_cnt == 0)
-			return QLA_ERROR;
 
 		msleep(2000);
 	}