diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-01-28 14:30:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-23 11:58:39 +0100 |
| commit | 37e7ae454c6b776855f7c316f682b7b9af7ab06e (patch) | |
| tree | 1ecb6a97b5f61a383e3dce196bb13d11eff06a57 /drivers/net | |
| parent | bf9b45129cedc2972d6148c84304dd3c4a9ab038 (diff) | |
| download | linux-stable-37e7ae454c6b776855f7c316f682b7b9af7ab06e.tar.gz linux-stable-37e7ae454c6b776855f7c316f682b7b9af7ab06e.tar.bz2 linux-stable-37e7ae454c6b776855f7c316f682b7b9af7ab06e.zip | |
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: eda50cde58de ("iwlwifi: pcie: add context information support")
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.b8b0dfce16ef.Ie20f0f7b23e5911350a2766524300d2915e7b677@changeid
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c index 31e72e1ff1e2..80ae33bba6a8 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c @@ -310,8 +310,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); |