From e9848aed147708a06193b40d78493b0ef6abccf2 Mon Sep 17 00:00:00 2001

From: Johannes Berg <johannes.berg@intel.com>

Date: Fri, 28 Jan 2022 14:30:52 +0200

Subject: [PATCH] iwlwifi: pcie: fix locking when "HW not ready"

Git-commit: e9848aed147708a06193b40d78493b0ef6abccf2

References: git-fixes

Patch-mainline: v5.17-rc5

If we run into this error path, we shouldn't unlock the mutex

since it's not locked since. Fix this.

Fixes: a6bd005fe92d ("iwlwifi: pcie: fix RF-Kill vs. firmware load race")

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

Signed-off-by: Kalle Valo <kvalo@kernel.org>

Link: https://lore.kernel.org/r/iwlwifi.20220128142706.5d16821d1433.Id259699ddf9806459856d6aefbdbe54477aecffd@changeid

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c

index a63386a01232..ef14584fc0a1 100644

--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c

@@ -1329,8 +1329,7 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,

 	/* This may fail if AMT took ownership of the device */

 	if (iwl_pcie_prepare_card_hw(trans)) {

 		IWL_WARN(trans, "Exit HW not ready\n");

-		ret = -EIO;

-		goto out;

+		return -EIO;

 	}

 	iwl_enable_rfkill_int(trans);

-- 

2.40.0