[BUGFIX] iwlwifi: mvm: don't init regulatory after failure
If the firmware init stage fails to run, mvm->nvm_data will not be
assigned. Therefore, iwl_mvm_is_lar_supported() crashes. Don't try
to continue the flow if an error happens here.
type=bugfix
ticket=none
fixes=I7d8d5c895bc467efbf81ea055dde366ea01cced1
Change-Id: I4baf45a296cff3694065745a63cc6a5d3461e054
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/316030
automatic-review: ec ger unix iil jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Tested-by: ec ger unix iil jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
x-iwlwifi-stack-dev: d676df5f27cb36d10d5a32b34f1ce7eadcb2c6fa
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index bf3e9a7..6dc9284 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -840,7 +840,7 @@
if (ret && ret != -ERFKILL)
iwl_fw_dbg_error_collect(&mvm->fwrt,
FW_DBG_TRIGGER_DRIVER);
- if (iwl_mvm_is_lar_supported(mvm)) {
+ if (!ret && iwl_mvm_is_lar_supported(mvm)) {
mvm->hw->wiphy->regulatory_flags |= REGULATORY_WIPHY_SELF_MANAGED;
ret = iwl_mvm_init_mcc(mvm);
}
diff --git a/versions b/versions
index 7ae4a40..b3d6f03 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:9241:db7f1102"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:9242:d676df5f"
