From e2af6483cb98b3759d089d62dba566dd7adbe5c2 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 1 Jul 2011 08:56:11 -0500
Subject: [PATCH] --- yaml --- r: 256193 b: refs/heads/master c:
 45a771385ceb644941b195f37ab98f7db39776bd h: refs/heads/master i:   256191:
 c23d2f5d0640da6035d5b4264d9fc3634e038a7e v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ab086c9c3070..152568b0c7e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb8b27ada953f8de182e628d71feff797707768a
+refs/heads/master: 45a771385ceb644941b195f37ab98f7db39776bd
diff --git a/trunk/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/trunk/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index 5c84131f62e5..5a65bea4cb8f 100644
--- a/trunk/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/trunk/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -932,8 +932,8 @@ int rtl92de_hw_init(struct ieee80211_hw *hw)
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
 			 ("Failed to download FW. Init HW "
 			 "without FW..\n"));
-		err = 1;
 		rtlhal->fw_ready = false;
+		return 1;
 	} else {
 		rtlhal->fw_ready = true;
 	}
@@ -1044,6 +1044,11 @@ int rtl92de_hw_init(struct ieee80211_hw *hw)
 				if (((tmp_rega & BIT(11)) == BIT(11)))
 					break;
 			}
+			/* check that loop was successful. If not, exit now */
+			if (i == 10000) {
+				rtlpci->init_ready = false;
+				return 1;
+			}
 		}
 	}
 	rtlpci->init_ready = true;