diff mbox series

[v5.4] iwlwifi: pcie: fix merge damage on making QnJ exclusive

Message ID 20191018104748.37249e76f17d.Id28ce460f03b8bac50e05d648e8ac15d32d6f14d@changeid (mailing list archive)
State Accepted
Commit 7cded5658329dd26b9a80d4a6de2665bf93e9006
Delegated to: Kalle Valo
Headers show
Series [v5.4] iwlwifi: pcie: fix merge damage on making QnJ exclusive | expand

Commit Message

Luca Coelho Oct. 18, 2019, 7:49 a.m. UTC 
From: Luca Coelho <luciano.coelho@intel.com>

Two patches were sent out of order: one removed some conditions from
an if and the other moved the code elsewhere.  When sending the patch
that moved the code, an older version of the original code was moved,
causing the "make QnJ exclusive" code to be essentially undone.

Fix that by removing the inclusive conditions from the check again.

Fixes: 809805a820c6 ("iwlwifi: pcie: move some cfg mangling from trans_pcie_alloc to probe")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
---

Kalle, can you please apply this directly to wireless-drivers? This
fixes a regression in v5.4.  Thanks!


 drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Kalle Valo Oct. 23, 2019, 10:29 a.m. UTC | #1 
Luca Coelho <luca@coelho.fi> wrote:

> From: Luca Coelho <luciano.coelho@intel.com>
> 
> Two patches were sent out of order: one removed some conditions from
> an if and the other moved the code elsewhere.  When sending the patch
> that moved the code, an older version of the original code was moved,
> causing the "make QnJ exclusive" code to be essentially undone.
> 
> Fix that by removing the inclusive conditions from the check again.
> 
> Fixes: 809805a820c6 ("iwlwifi: pcie: move some cfg mangling from trans_pcie_alloc to probe")
> Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

Patch applied to wireless-drivers.git, thanks.

7cded5658329 iwlwifi: pcie: fix merge damage on making QnJ exclusive
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 6f4bb7ce71a5..9d41d783e59f 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1067,11 +1067,7 @@  static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		}
 	} else if (CSR_HW_RF_ID_TYPE_CHIP_ID(iwl_trans->hw_rf_id) ==
 		   CSR_HW_RF_ID_TYPE_CHIP_ID(CSR_HW_RF_ID_TYPE_HR) &&
-		   ((cfg != &iwl_ax200_cfg_cc &&
-		     cfg != &killer1650x_2ax_cfg &&
-		     cfg != &killer1650w_2ax_cfg &&
-		     cfg != &iwl_ax201_cfg_quz_hr) ||
-		    iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0)) {
+		   iwl_trans->hw_rev == CSR_HW_REV_TYPE_QNJ_B0) {
 		u32 hw_status;
 
 		hw_status = iwl_read_prph(iwl_trans, UMAG_GEN_HW_STATUS);