From f7ebe3e05d2baf73d919be95ecd21864d23a3b5b Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Fri, 2 Mar 2012 13:22:46 -0600
Subject: [PATCH] --- yaml --- r: 291151 b: refs/heads/master c:
 8f526ab4aa1b145bda2baf56e223050c7ef3e1b0 h: refs/heads/master i:   291149:
 dad9d3e874a837d38fd3d8eaf0c256139bd91cee   291147:
 17fbe62e1beca825fd48f011e583685eb1241753   291143:
 1b8679f4d10971961ea1c519a30ea5be861a9cfa   291135:
 524815ebd4964ebfb07d7f69e25f18d11a20b0c3 v: v3

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

diff --git a/[refs] b/[refs]
index c221069b338c..a8bdab172665 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48de1a17fc41613b7e9d61037fa989256d04234f
+refs/heads/master: 8f526ab4aa1b145bda2baf56e223050c7ef3e1b0
diff --git a/trunk/drivers/net/wireless/rtlwifi/usb.c b/trunk/drivers/net/wireless/rtlwifi/usb.c
index b0eee0eb5679..2e1e352864bb 100644
--- a/trunk/drivers/net/wireless/rtlwifi/usb.c
+++ b/trunk/drivers/net/wireless/rtlwifi/usb.c
@@ -362,7 +362,7 @@ static int _rtl_usb_init(struct ieee80211_hw *hw)
 	return err;
 }
 
-static int _rtl_usb_init_sw(struct ieee80211_hw *hw)
+static void rtl_usb_init_sw(struct ieee80211_hw *hw)
 {
 	struct rtl_mac *mac = rtl_mac(rtl_priv(hw));
 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
@@ -397,7 +397,6 @@ static int _rtl_usb_init_sw(struct ieee80211_hw *hw)
 	/* HIMR_EX - turn all on */
 	rtlusb->irq_mask[1] = 0xFFFFFFFF;
 	rtlusb->disableHWSM =  true;
-	return 0;
 }
 
 #define __RADIO_TAP_SIZE_RSV	32
@@ -983,7 +982,7 @@ int __devinit rtl_usb_probe(struct usb_interface *intf,
 	err = _rtl_usb_init(hw);
 	if (err)
 		goto error_out;
-	err = _rtl_usb_init_sw(hw);
+	rtl_usb_init_sw(hw);
 	/* Init mac80211 sw */
 	err = rtl_init_core(hw);
 	if (err) {