Commit 968dcfb4 authored by Luca Coelho's avatar Luca Coelho Committed by Kalle Valo
Browse files

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: 5a8c31aa ("iwlwifi: pcie: fix recognition of QuZ devices")
Cc: stable@vger.kernel.org # 5.2
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 7caac62e

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

+12 −12
Original line number Diff line number Diff line
@@ -1070,18 +1070,18 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	/* same thing for QuZ... */

	if (iwl_trans->hw_rev == CSR_HW_REV_TYPE_QUZ) {

		if (cfg == &iwl_ax101_cfg_qu_hr)

			cfg = &iwl_ax101_cfg_quz_hr;

		else if (cfg == &iwl_ax201_cfg_qu_hr)

			cfg = &iwl_ax201_cfg_quz_hr;

		else if (cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)

			cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;

		else if (cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)

			cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;

		else if (cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)

			cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;

		else if (cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)

			cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;

		if (iwl_trans->cfg == &iwl_ax101_cfg_qu_hr)

			iwl_trans->cfg = &iwl_ax101_cfg_quz_hr;

		else if (iwl_trans->cfg == &iwl_ax201_cfg_qu_hr)

			iwl_trans->cfg = &iwl_ax201_cfg_quz_hr;

		else if (iwl_trans->cfg == &iwl9461_2ac_cfg_qu_b0_jf_b0)

			iwl_trans->cfg = &iwl9461_2ac_cfg_quz_a0_jf_b0_soc;

		else if (iwl_trans->cfg == &iwl9462_2ac_cfg_qu_b0_jf_b0)

			iwl_trans->cfg = &iwl9462_2ac_cfg_quz_a0_jf_b0_soc;

		else if (iwl_trans->cfg == &iwl9560_2ac_cfg_qu_b0_jf_b0)

			iwl_trans->cfg = &iwl9560_2ac_cfg_quz_a0_jf_b0_soc;

		else if (iwl_trans->cfg == &iwl9560_2ac_160_cfg_qu_b0_jf_b0)

			iwl_trans->cfg = &iwl9560_2ac_160_cfg_quz_a0_jf_b0_soc;

	}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE