From: Eran Harary Date: Sun, 22 Dec 2013 06:06:34 +0000 (+0200) Subject: iwlwifi: pcie: Disable L0S exit timer for 8000 HW family X-Git-Tag: accepted/tizen/common/20141203.182822~316^2~18^2^2~371^2~63 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4a9f8cea50406a57c8dc5429d9aca6429d82436;p=platform%2Fkernel%2Flinux-arm64.git iwlwifi: pcie: Disable L0S exit timer for 8000 HW family This configuration is invalid for this family. Signed-off-by: Eran Harary Reviewed-by: Dor Shaish Signed-off-by: Emmanuel Grumbach --- diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index 53a3457..ff7d70d 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -132,8 +132,9 @@ static int iwl_pcie_apm_init(struct iwl_trans *trans) */ /* Disable L0S exit timer (platform NMI Work/Around) */ - iwl_set_bit(trans, CSR_GIO_CHICKEN_BITS, - CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER); + if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) + iwl_set_bit(trans, CSR_GIO_CHICKEN_BITS, + CSR_GIO_CHICKEN_BITS_REG_BIT_DIS_L0S_EXIT_TIMER); /* * Disable L0s without affecting L1;