From: Eran Harary <eran.harary@intel.com>
Date: Sun, 22 Dec 2013 06:06:34 +0000 (+0200)
Subject: iwlwifi: pcie: Disable L0S exit timer for 8000 HW family
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e4a9f8cea50406a57c8dc5429d9aca6429d82436;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

iwlwifi: pcie: Disable L0S exit timer for 8000 HW family

This configuration is invalid for this family.

Signed-off-by: Eran Harary <eran.harary@intel.com>
Reviewed-by: Dor Shaish <dor.shaish@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 53a34573f0f0..ff7d70da64f9 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;