From f283d60482001b48f977e0db9b96d016ef2312df Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Thu, 9 Feb 2012 18:19:52 -0600
Subject: [PATCH] --- yaml --- r: 290626 b: refs/heads/master c:
 3fccdcf5091eaaa0d7582bedbc035163b40714b9 h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 3 ++-
 trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2c2c8013f5dc..f4aa02ef7d2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52e1409f72d629644b496db80c119e04ebabad90
+refs/heads/master: 3fccdcf5091eaaa0d7582bedbc035163b40714b9
diff --git a/trunk/drivers/net/wireless/rtlwifi/rtl8192se/fw.h b/trunk/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
index babe85d4b694..b4afff626437 100644
--- a/trunk/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
+++ b/trunk/drivers/net/wireless/rtlwifi/rtl8192se/fw.h
@@ -30,6 +30,7 @@
 #define __REALTEK_FIRMWARE92S_H__
 
 #define RTL8190_MAX_FIRMWARE_CODE_SIZE		64000
+#define RTL8190_MAX_RAW_FIRMWARE_CODE_SIZE	90000
 #define RTL8190_CPU_START_OFFSET		0x80
 /* Firmware Local buffer size. 64k */
 #define	MAX_FIRMWARE_CODE_SIZE			0xFF00
@@ -217,7 +218,7 @@ struct rt_firmware {
 	u8 fw_emem[RTL8190_MAX_FIRMWARE_CODE_SIZE];
 	u32 fw_imem_len;
 	u32 fw_emem_len;
-	u8 sz_fw_tmpbuffer[164000];
+	u8 sz_fw_tmpbuffer[RTL8190_MAX_RAW_FIRMWARE_CODE_SIZE];
 	u32 sz_fw_tmpbufferlen;
 	u16 cmdpacket_fragthresold;
 };
diff --git a/trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c b/trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index ca38dd9f3564..345d752137fa 100644
--- a/trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/trunk/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@ -108,6 +108,7 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
 	if (firmware->size > rtlpriv->max_fw_size) {
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 			 "Firmware is too big!\n");
+		rtlpriv->max_fw_size = 0;
 		release_firmware(firmware);
 		return;
 	}
@@ -232,7 +233,7 @@ static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
 		return 1;
 	}
 
-	rtlpriv->max_fw_size = sizeof(struct rt_firmware);
+	rtlpriv->max_fw_size = RTL8190_MAX_RAW_FIRMWARE_CODE_SIZE;
 
 	pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
 		"Loading firmware %s\n", rtlpriv->cfg->fw_name);