From: Luca Coelho luciano.coelho@intel.com
There was a merge damage when we added support for quz firmwares. We should be checking for CSR_HW_REV_TYPE_QUZ and not CSR_HW_REV_TYPE_QNJ_B0. Fix that.
Fixes: debec2f23910 ("iwlwifi: add support for quz firmwares") Cc: stable@vger.kernel.org # v5.1 Reported-by: Bjørn Mork bjorn@mork.no Signed-off-by: Luca Coelho luciano.coelho@intel.com --- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c index 602c31b3992a..0338bf9184a5 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c @@ -3579,8 +3579,8 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev, } else if (cfg == &iwl_ax101_cfg_qu_hr) { if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) == CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) && - trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) { - trans->cfg = &iwl22000_2ax_cfg_qnj_hr_b0; + trans->hw_rev == CSR_HW_REV_TYPE_QUZ) { + trans->cfg = &iwl_ax101_cfg_quz_hr; } else if (CSR_HW_RF_ID_TYPE_CHIP_ID(trans->hw_rf_id) == CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR)) { trans->cfg = &iwl_ax101_cfg_qu_hr;
linux-stable-mirror@lists.linaro.org