From b84d332be4cad96053343a6ba93ff13eb3051826 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 8 Jan 2013 10:26:17 +0100 Subject: [PATCH] --- yaml --- r: 351928 b: refs/heads/master c: b1cf1bc160a94f2d56863522982160c9373b8860 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/pcie/trans.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index cae95092f9f4..acb84baff52e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d21fa2dad63677b5fd0c9942c0745c1e4f0832df +refs/heads/master: b1cf1bc160a94f2d56863522982160c9373b8860 diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c b/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c index db3b0552b2eb..2de5770de64b 100644 --- a/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -719,9 +719,6 @@ static int iwl_trans_pcie_resume(struct iwl_trans *trans) hw_rfkill = iwl_is_rfkill_set(trans); iwl_op_mode_hw_rf_kill(trans->op_mode, hw_rfkill); - if (!hw_rfkill) - iwl_enable_interrupts(trans); - return 0; } #endif /* CONFIG_PM_SLEEP */