diff options
| author | Sara Sharon <sara.sharon@intel.com> | 2017-03-22 14:07:50 +0200 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2017-06-05 23:29:37 +0300 |
| commit | 6e5848732288d93f14bb30ce81f09950988556dd (patch) | |
| tree | 63347bea8198ec88c6fddcb3c5f15a35d59a55e5 /drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | |
| parent | de8ba41b5e5002e28756963df311246485c330d5 (diff) | |
| download | linux-6e5848732288d93f14bb30ce81f09950988556dd.tar.gz linux-6e5848732288d93f14bb30ce81f09950988556dd.tar.bz2 linux-6e5848732288d93f14bb30ce81f09950988556dd.zip | |
iwlwifi: add 9000 and A000 device families
Add two new device families to differentiate them from 8000.
Signed-off-by: Sara Sharon <sara.sharon@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/nvm.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c index 30ecbc14b3d0..87b9ebfc653e 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c @@ -447,8 +447,9 @@ int iwl_mvm_read_external_nvm(struct iwl_mvm *mvm) le32_to_cpu(dword_buff[3])); /* nvm file validation, dword_buff[2] holds the file version */ - if ((CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_C_STEP && - le32_to_cpu(dword_buff[2]) < 0xE4A)) { + if (mvm->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000 && + CSR_HW_REV_STEP(mvm->trans->hw_rev) == SILICON_C_STEP && + le32_to_cpu(dword_buff[2]) < 0xE4A) { ret = -EFAULT; goto out; } |