]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commit
iwlwifi: mvm: fix NVM check for 3168 devices
authorLuca Coelho <luciano.coelho@intel.com>
Mon, 25 Nov 2019 11:21:58 +0000 (13:21 +0200)
committerKhalid Elmously <khalid.elmously@canonical.com>
Sat, 8 Aug 2020 05:53:12 +0000 (01:53 -0400)
commitadabc36a74a5eb9f57c066dffdb77af866fc96f2
tree6a016ea18b48c9c3c1859c7453cbaca04ce61085
parenta1422fd6b259ca7947d437ed32366bfb49183bdd
iwlwifi: mvm: fix NVM check for 3168 devices

BugLink: https://bugs.launchpad.net/bugs/1884089
[ Upstream commit b3f20e098293892388d6a0491d6bbb2efb46fbff ]

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 <stsp@stsp.name>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/net/wireless/intel/iwlwifi/mvm/nvm.c