aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2014-04-26 21:59:04 +0100
committerBen Hutchings <ben@decadent.org.uk>2014-06-09 13:29:05 +0100
commit21d2e13e30c300e1a9eca42723454d67901bf58f (patch)
tree6fd1013d1f2d75ec62b6e5f3141795e8e5f77774
parentb65a5347670630ec3230d6f90d28d136c7afc797 (diff)
downloadkernel_samsung_smdk4412-21d2e13e30c300e1a9eca42723454d67901bf58f.zip
kernel_samsung_smdk4412-21d2e13e30c300e1a9eca42723454d67901bf58f.tar.gz
kernel_samsung_smdk4412-21d2e13e30c300e1a9eca42723454d67901bf58f.tar.bz2
rtl8192cu: Fix unbalanced irq enable in error path of rtl92cu_hw_init()
commit 3234f5b06fc3094176a86772cc64baf3decc98fc upstream. Fixes: a53268be0cb9 ('rtlwifi: rtl8192cu: Fix too long disable of IRQs') Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: John W. Linville <linville@tuxdriver.com> [bwh: Backported to 3.2: adjust context]
-rw-r--r--drivers/net/wireless/rtlwifi/rtl8192cu/hw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index bbd5eba..79fc4b7 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -1174,7 +1174,7 @@ int rtl92cu_hw_init(struct ieee80211_hw *hw)
err = _rtl92cu_init_mac(hw);
if (err) {
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, ("init mac failed!\n"));
- return err;
+ goto exit;
}
err = rtl92c_download_fw(hw);
if (err) {