diff options
| author | Tova Mussai <tova.mussai@intel.com> | 2019-07-04 12:41:01 +0200 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2019-09-06 14:31:21 +0200 |
| commit | c8cfa08e39c17be2956c0379de38c885e1b11b66 (patch) | |
| tree | 67c5855ff48db1059807de189b09cb1abb729d9d /drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | |
| parent | iwlwifi: remove unnecessary IWL_DEVICE_AX200_COMMON definition (diff) | |
| download | linux-c8cfa08e39c17be2956c0379de38c885e1b11b66.tar.xz linux-c8cfa08e39c17be2956c0379de38c885e1b11b66.zip | |
iwlwifi: allocate bigger nvm data in case of UHB
In case of Ultra-high-band (UHB), need to allocate nvm data structure in
size of UHB channels array.
Signed-off-by: Tova Mussai <tova.mussai@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index fd386bfbd5df..6d95941f56a7 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -942,7 +942,11 @@ iwl_parse_nvm_data(struct iwl_trans *trans, const struct iwl_cfg *cfg, u16 lar_config; const __le16 *ch_section; - if (cfg->nvm_type != IWL_NVM_EXT) + if (cfg->uhb_supported) + data = kzalloc(struct_size(data, channels, + IWL_NVM_NUM_CHANNELS_UHB), + GFP_KERNEL); + else if (cfg->nvm_type != IWL_NVM_EXT) data = kzalloc(struct_size(data, channels, IWL_NVM_NUM_CHANNELS), GFP_KERNEL); |