]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7b628a5c43b5ab0ce8731f27804d7b81a08f8b85
tree1f532c60eddb513f16ca3fd254d71f73dd5ceb56
parentcb833ba4e81c9d3decf48347ea35d2d11c8f0cfd
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: a53936f56b1d ("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