---

yaml --- r: 290646 b: refs/heads/master c: 3976b45 h: refs/heads/master v: v3
git-mirror · Feb 22, 2012 · c9d45c1 · c9d45c1
1 parent 4b7f2d0
commit c9d45c1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 71e0c6c267595f406cf0e0699bacf10098e0f387
+refs/heads/master: 3976b4519458b27753196e63c89b2a774129e19a
diff --git a/trunk/drivers/net/wireless/iwlegacy/4965-mac.c b/trunk/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5523,13 +5523,11 @@ __il4965_up(struct il_priv *il)
 	/* If platform's RF_KILL switch is NOT set to KILL */
 	if (_il_rd(il, CSR_GP_CNTRL) & CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW)
 		clear_bit(S_RF_KILL_HW, &il->status);
-	else
+	else {
 		set_bit(S_RF_KILL_HW, &il->status);
-
-	if (il_is_rfkill(il)) {
 		wiphy_rfkill_set_hw_state(il->hw->wiphy, true);
 
-		il_enable_interrupts(il);
+		il_enable_rfkill_int(il);
 		IL_WARN("Radio disabled by HW RF Kill switch\n");
 		return 0;
 	}