From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 5 Mar 2012 20:05:54 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.12-rc1~3664^2~139^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=051d3b50430160a86cbe4a2deef219c8038bd03f;p=kernel%2Fkernel-generic.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
---

051d3b50430160a86cbe4a2deef219c8038bd03f
diff --cc drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index eda30b9,345d752..f1b3600
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@@ -226,10 -227,13 +227,10 @@@ static int rtl92s_init_sw_vars(struct i
  
  	/* for firmware buf */
  	rtlpriv->rtlhal.pfirmware = vzalloc(sizeof(struct rt_firmware));
 -	if (!rtlpriv->rtlhal.pfirmware) {
 -		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
 -			 "Can't alloc buffer for fw\n");
 +	if (!rtlpriv->rtlhal.pfirmware)
  		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);