diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-07-30 20:10:46 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-08-06 10:31:05 +0200 |
| commit | eeb89ab1f081a62bee1695d82442996b99a5b2b3 (patch) | |
| tree | 2475208730470b10afefa64b265a3841e393ec89 | |
| parent | 3848ab66827bddd7eb760c58dec909f0af1c00a5 (diff) | |
| download | op-kernel-dev-eeb89ab1f081a62bee1695d82442996b99a5b2b3.zip op-kernel-dev-eeb89ab1f081a62bee1695d82442996b99a5b2b3.tar.gz | |
iwlwifi: pcie: fix resume when no opmode is present
If no opmode is present during suspend/resume (i.e. if
the iwldvm or iwlmvm isn't loaded) the driver crashes
during resume, trying to call the rfkill notification.
Avoid that, and also don't enable the rfkill interrupt
in this case (to avoid crashing trying to handle the
interrupt later.)
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/trans.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index cec0c89..601ee59 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -825,6 +825,9 @@ static int iwl_trans_pcie_resume(struct iwl_trans *trans) { bool hw_rfkill; + if (!trans->op_mode) + return 0; + iwl_enable_rfkill_int(trans); hw_rfkill = iwl_is_rfkill_set(trans); |
