diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-05-26 19:20:34 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-05-26 19:20:57 +0300 |
| commit | 04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c (patch) | |
| tree | 9863c0473469c5b594ad0e5dab29d37b6900bdf8 /drivers/net/wireless/iwlwifi/pcie | |
| parent | 05c3274d56ee783cb291a779ec2b369e9d172450 (diff) | |
| parent | 292208914d8ca5a41cf68c2f1d2810a2ea2044e9 (diff) | |
| download | linux-04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c.tar.gz | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/Kconfig
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/trans.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index 4526336672c5..8e5be8d6f4a8 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -1067,9 +1067,11 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power) iwl_pcie_rx_stop(trans); /* Power-down device's busmaster DMA clocks */ - iwl_write_prph(trans, APMG_CLK_DIS_REG, - APMG_CLK_VAL_DMA_CLK_RQT); - udelay(5); + if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) { + iwl_write_prph(trans, APMG_CLK_DIS_REG, + APMG_CLK_VAL_DMA_CLK_RQT); + udelay(5); + } } /* Make sure (redundant) we've released our request to stay awake */ |