diff mbox series

[4/5] wifi: iwlwifi: mvm: return error value in case PLDR sync failed

Message ID 20221123225313.08b345123f83.I13bfacc2f6da7de8ada90127fe7108d1bb73af92@changeid (mailing list archive)
State Accepted
Commit 9ada2bb507964b8728f93cfcb93fc57e8709f07a
Delegated to: Gregory Greenman
Headers show
Series updates and fixes intended for v6.2 2022-11-23 | expand

Commit Message

Greenman, Gregory Nov. 23, 2022, 9:02 p.m. UTC 
From: Avraham Stern <avraham.stern@intel.com>

In case PLDR sync is required but iwlmei failed to get a response
from CSME, the device cannot be brought up, so return an error
value.

Reported-by: Dan Carpenter <error27@gmail.com>
Link: https://lore.kernel.org/all/Y3uYUEFnMiBY2ABQ@kili/
Signed-off-by: Avraham Stern <avraham.stern@intel.com>
Signed-off-by: Gregory Greenman <gregory.greenman@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 74354d044db9..2f4c9e653e99 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -1483,7 +1483,7 @@  int iwl_mvm_up(struct iwl_mvm *mvm)
 	sb_cfg = iwl_read_umac_prph(mvm->trans, SB_MODIFY_CFG_FLAG);
 	mvm->pldr_sync = !(sb_cfg & SB_CFG_RESIDES_IN_OTP_MASK);
 	if (mvm->pldr_sync && iwl_mei_pldr_req())
-		return ret;
+		return -EBUSY;
 
 	ret = iwl_mvm_load_rt_fw(mvm);
 	if (ret) {