summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/iwlwifi/pcie
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-11-04 21:16:00 +0300
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-11-11 18:15:10 +0300
commit6a08f5144c871ea6ea1614f1bd742eb450d9325a (patch)
tree78ac256c1a692a55007dac74a44af849e24c3d5d /drivers/net/wireless/iwlwifi/pcie
parent01e58a281e6f0184e54af19a74de9a4012eeab25 (diff)
downloadlinux-6a08f5144c871ea6ea1614f1bd742eb450d9325a.tar.xz
iwlwifi: pcie: newer platform needs a OS alive indication
This is fully backward compatible with older platforms. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie')
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/trans.c3
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 d8727491fee5..12cb427b742a 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -512,6 +512,9 @@ static int iwl_pcie_set_hw_ready(struct iwl_trans *trans)
CSR_HW_IF_CONFIG_REG_BIT_NIC_READY,
HW_READY_TIMEOUT);
+ if (ret >= 0)
+ iwl_set_bit(trans, CSR_MBOX_SET_REG, CSR_MBOX_SET_REG_OS_ALIVE);
+
IWL_DEBUG_INFO(trans, "hardware%s ready\n", ret < 0 ? " not" : "");
return ret;
}