2020-04-02 09:08:14 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: "Dutta, Ranjan" <ranjan.dutta@intel.com>
|
|
|
|
|
Date: Tue, 10 Mar 2020 21:56:56 +0800
|
|
|
|
|
Subject: [PATCH] Revert "iwlwifi: mvm: fix NVM check for 3168 devices"
|
|
|
|
|
|
|
|
|
|
This reverts commit 9940e10dd2214959cdfa9dd81137147938715e97.
|
|
|
|
|
|
|
|
|
|
Tracked-On: PKT-3177
|
|
|
|
|
---
|
|
|
|
|
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
|
2020-10-27 02:14:06 +08:00
|
|
|
index 875557ce0d66..56713f170d7b 100644
|
2020-04-02 09:08:14 +08:00
|
|
|
--- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
|
|
|
|
|
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c
|
|
|
|
|
@@ -286,7 +286,7 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
|
|
|
|
|
int regulatory_type;
|
|
|
|
|
|
|
|
|
|
/* Checking for required sections */
|
|
|
|
|
- if (mvm->trans->cfg->nvm_type == IWL_NVM) {
|
|
|
|
|
+ if (mvm->trans->cfg->nvm_type != IWL_NVM_EXT) {
|
|
|
|
|
if (!mvm->nvm_sections[NVM_SECTION_TYPE_SW].data ||
|
|
|
|
|
!mvm->nvm_sections[mvm->cfg->nvm_hw_section_num].data) {
|
|
|
|
|
IWL_ERR(mvm, "Can't parse empty OTP/NVM sections\n");
|
|
|
|
|
--
|
|
|
|
|
https://clearlinux.org
|
|
|
|
|
|
