b3f20e098293892388d6a0491d6bbb2efb46fbff is the first bad commit commit b3f20e098293892388d6a0491d6bbb2efb46fbff Author: Luca Coelho Date: Mon Nov 25 13:21:58 2019 +0200 iwlwifi: mvm: fix NVM check for 3168 devices We had a check on !NVM_EXT and then a check for NVM_SDP in the else block of this if. The else block, obviously, could only be reached if using NVM_EXT, so it would never be NVM_SDP. Fix that by checking whether the nvm_type is IWL_NVM instead of checking for !IWL_NVM_EXT to solve this issue. Reported-by: Stefan Sperling Signed-off-by: Luca Coelho :040000 040000 923b8f7ba8a5826190d4b1b52a00a2fca0304687 529cfe362357c9ec6d411a687d9e41ac86a94d91 M drivers