From: Tova Mussai Date: Thu, 4 Jul 2019 10:41:01 +0000 (+0300) Subject: iwlwifi: allocate bigger nvm data in case of UHB X-Git-Tag: v5.4-rc1~131^2~61^2^2~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8cfa08e39c17be2956c0379de38c885e1b11b66;p=platform%2Fkernel%2Flinux-rpi.git 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 Signed-off-by: Luca Coelho --- diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index fd386bf..6d95941 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);