Skip to content

Commit 968dcfb

Browse files
lucacoelhoKalle Valo
authored andcommitted
iwlwifi: assign directly to iwl_trans->cfg in QuZ detection
We were erroneously assigning the new configuration to a local variable cfg, but that was not being assigned to anything, so the change was getting lost. Assign directly to iwl_trans->cfg instead. Fixes: 5a8c31a ("iwlwifi: pcie: fix recognition of QuZ devices") Cc: stable@vger.kernel.org # 5.2 Signed-off-by: Luca Coelho <luciano.coelho@intel.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
1 parent 7caac62 commit 968dcfb

File tree

1 file changed

+12
-12
lines changed
  • drivers/net/wireless/intel/iwlwifi/pcie

1 file changed

+12
-12
lines changed

drivers/net/wireless/intel/iwlwifi/pcie/drv.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,18 +1070,18 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
10701070

10711071
/* same thing for QuZ... */
10721072
if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {
1073-
if (cfg == &iwl_ax101_cfg_qu_hr)
1074-
cfg = &iwl_ax101_cfg_quz_hr;
1075-
else if (cfg == &iwl_ax201_cfg_qu_hr)
1076-
cfg = &iwl_ax201_cfg_quz_hr;
1077-
else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
1078-
cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
1079-
else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
1080-
cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
1081-
else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
1082-
cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
1083-
else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
1084-
cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
1073+
if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr)
1074+
iwl_trans->cfg = &iwl_ax101_cfg_quz_hr;
1075+
else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)
1076+
iwl_trans->cfg = &iwl_ax201_cfg_quz_hr;
1077+
else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)
1078+
iwl_trans->cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;
1079+
else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)
1080+
iwl_trans->cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;
1081+
else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)
1082+
iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;
1083+
else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)
1084+
iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;
10851085
}
10861086

10871087
#endif

0 commit comments

Comments
 (0)