Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e8c5b21 authored by Johannes Berg's avatar Johannes Berg Committed by Greg Kroah-Hartman
Browse files

iwlwifi: pcie: gen2: fix locking when "HW not ready" 



commit 4c29c1e27a1e178a219b3877d055e6dd643bdfda upstream.

If we run into this error path, we shouldn't unlock the mutex
since it's not locked since. Fix this in the gen2 code as well.

Fixes: eda50cde ("iwlwifi: pcie: add context information support")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/iwlwifi.20220128142706.b8b0dfce16ef.Ie20f0f7b23e5911350a2766524300d2915e7b677@changeid


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1d0e738

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

+1 −2
Original line number Diff line number Diff line
@@ -292,8 +292,7 @@ int iwl_trans_pcie_gen2_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);