iwlwifi: mvm: Do not require PHY_SKU NVM section for 3168 devices
The logic for checking required NVM sections was recently fixed in commitb3f20e0982
("iwlwifi: mvm: fix NVM check for 3168 devices"). However, with that fixed the else is now taken for 3168 devices and within the else clause there is a mandatory check for the PHY_SKU section. This causes the parsing to fail for 3168 devices. The PHY_SKU section is really only mandatory for the IWL_NVM_EXT layout (the phy_sku parameter of iwl_parse_nvm_data is only used when the NVM type is IWL_NVM_EXT). So this changes the PHY_SKU section check so that it's only mandatory for IWL_NVM_EXT. Fixes:b3f20e0982
("iwlwifi: mvm: fix NVM check for 3168 devices") Signed-off-by: Dan Moulding <dmoulding@me.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Родитель
bb6d3fb354
Коммит
a9149d243f
|
@ -308,7 +308,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
|
|||
}
|
||||
|
||||
/* PHY_SKU section is mandatory in B0 */
|
||||
if (!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) {
|
||||
if (mvm->trans->cfg->nvm_type == IWL_NVM_EXT &&
|
||||
!mvm->nvm_sections[NVM_SECTION_TYPE_PHY_SKU].data) {
|
||||
IWL_ERR(mvm,
|
||||
"Can't parse phy_sku in B0, empty sections\n");
|
||||
return NULL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче