summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/realtek/rtlwifi/ps.c
diff options
context:
space:
mode:
authorLuca Coelho <luciano.coelho@intel.com>2019-10-18 10:49:01 +0300
committerKalle Valo <kvalo@codeaurora.org>2019-10-23 13:29:11 +0300
commit7cded5658329dd26b9a80d4a6de2665bf93e9006 (patch)
tree1f532c60eddb513f16ca3fd254d71f73dd5ceb56 /drivers/net/wireless/realtek/rtlwifi/ps.c
parentd79749f7716d9dc32fa2d5075f6ec29aac63c76d (diff)
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>
Diffstat (limited to 'drivers/net/wireless/realtek/rtlwifi/ps.c')
0 files changed, 0 insertions, 0 deletions