diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2022-01-28 13:30:53 +0100 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2022-02-03 09:24:48 +0100 |
| commit | 4c29c1e27a1e178a219b3877d055e6dd643bdfda (patch) | |
| tree | 343866462a12811f977500cfcaa43a5cc6e6e6db /drivers/net/wireless | |
| parent | iwlwifi: pcie: fix locking when "HW not ready" (diff) | |
| download | linux-4c29c1e27a1e178a219b3877d055e6dd643bdfda.tar.xz linux-4c29c1e27a1e178a219b3877d055e6dd643bdfda.zip | |
iwlwifi: pcie: gen2: fix locking when "HW not ready"
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
Diffstat (limited to 'drivers/net/wireless')
| -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 0febdcacbd42..94f40c4d2421 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c @@ -385,8 +385,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); |