diff options
| author | David S. Miller | 2017-08-07 20:34:41 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-07 20:37:47 +0200 |
| commit | 46d4b68f891bee5d83a32508bfbd9778be6b1b63 (patch) | |
| tree | 3c05e6c6285102eef6f6756bd692e86ae86f9b30 /drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | |
| parent | hns3: fix unused function warning (diff) | |
| parent | rtlwifi: Replace hardcode value with macro (diff) | |
| download | kernel-qcow2-linux-46d4b68f891bee5d83a32508bfbd9778be6b1b63.tar.gz kernel-qcow2-linux-46d4b68f891bee5d83a32508bfbd9778be6b1b63.tar.xz kernel-qcow2-linux-46d4b68f891bee5d83a32508bfbd9778be6b1b63.zip | |
Merge tag 'wireless-drivers-next-for-davem-2017-08-07' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.14
The first wireless-drivers-next pull request for 4.14. I'm submitting
this unusally late in the cycle as my vacation postponed this. But
even if this is late there's not still that much new features, mostly
cleanup or fixes.
Major changes:
ath10k
* preparation for wcn3990 support
iwlwifi
* Reorganization of the code into separate directories continues
qtnfmac
* regulatory support updates
* add get_channel, dump_survey and channel_switch cfg80211 handlers
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/nvm.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c index dac7e542a190..5cc749261ce3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/nvm.c @@ -576,11 +576,8 @@ int iwl_mvm_nvm_get_from_fw(struct iwl_mvm *mvm) } rsp = (void *)hcmd.resp_pkt->data; - if (le32_to_cpu(rsp->general.flags)) { - IWL_ERR(mvm, "Invalid NVM data from FW\n"); - ret = -EINVAL; - goto out; - } + if (le32_to_cpu(rsp->general.flags) & NVM_GENERAL_FLAGS_EMPTY_OTP) + IWL_INFO(mvm, "OTP is empty\n"); mvm->nvm_data = kzalloc(sizeof(*mvm->nvm_data) + sizeof(struct ieee80211_channel) * |