iwlwifi: pcie: fix merge damage on making QnJ exclusive
authorLuca Coelho <luciano.coelho@intel.com>
Fri, 18 Oct 2019 07:49:01 +0000 (10:49 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Wed, 23 Oct 2019 10:29:11 +0000 (13:29 +0300)
commit7cded5658329dd26b9a80d4a6de2665bf93e9006
tree1f532c60eddb513f16ca3fd254d71f73dd5ceb56
parentd79749f7716d9dc32fa2d5075f6ec29aac63c76d
iwlwifi: pcie: fix merge damage on making QnJ exclusive

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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/intel/iwlwifi/pcie/drv.c