From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 6 Feb 2012 19:26:39 +0000 (-0500)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: master-2012-04-09~146^2~376^2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=8926574c4d0055ca4c4a02d1f6b2c249d01a0621;p=~andy%2Flinux

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

Conflicts:
	drivers/net/wireless/rtlwifi/rtl8192se/sw.c
---

8926574c4d0055ca4c4a02d1f6b2c249d01a0621
diff --cc drivers/net/wireless/rtlwifi/rtl8192se/sw.c
index 36140ccf2ab,ca38dd9f356..eda30b9d0f1
--- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c
@@@ -186,9 -226,14 +226,11 @@@ 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);
+ 
  	pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
  		"Loading firmware %s\n", rtlpriv->cfg->fw_name);
  	/* request fw */