* [PATCH] wifi: iwlwifi: pcie: unlock on error in iwl_trans_pcie_gen2_start_fw()
@ 2025-06-25 15:22 Dan Carpenter
2025-06-25 17:44 ` Korenblit, Miriam Rachel
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2025-06-25 15:22 UTC (permalink / raw)
To: Miri Korenblit
Cc: Johannes Berg, Emmanuel Grumbach, linux-wireless, linux-kernel,
kernel-janitors
We need to call mutex_unlock(&trans_pcie->mutex) before returning on this
error path.
Fixes: aeee73e27f2d ("wifi: iwlwifi: pcie: move generation specific files to a folder")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
index 0df8522ca410..8ff23f3931c6 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
@@ -546,8 +546,10 @@ int iwl_trans_pcie_gen2_start_fw(struct iwl_trans *trans,
}
if (WARN_ON(trans->do_top_reset &&
- trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_SC))
- return -EINVAL;
+ trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_SC)) {
+ ret = -EINVAL;
+ goto out;
+ }
/* we need to wait later - set state */
if (trans->do_top_reset)
--
2.47.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* RE: [PATCH] wifi: iwlwifi: pcie: unlock on error in iwl_trans_pcie_gen2_start_fw()
2025-06-25 15:22 [PATCH] wifi: iwlwifi: pcie: unlock on error in iwl_trans_pcie_gen2_start_fw() Dan Carpenter
@ 2025-06-25 17:44 ` Korenblit, Miriam Rachel
0 siblings, 0 replies; 2+ messages in thread
From: Korenblit, Miriam Rachel @ 2025-06-25 17:44 UTC (permalink / raw)
To: Dan Carpenter
Cc: Berg, Johannes, Grumbach, Emmanuel,
linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
> Subject: [PATCH] wifi: iwlwifi: pcie: unlock on error in
> iwl_trans_pcie_gen2_start_fw()
>
> We need to call mutex_unlock(&trans_pcie->mutex) before returning on this
> error path.
>
> Fixes: aeee73e27f2d ("wifi: iwlwifi: pcie: move generation specific files to a
> folder")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
> b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
> index 0df8522ca410..8ff23f3931c6 100644
> --- a/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
> +++ b/drivers/net/wireless/intel/iwlwifi/pcie/gen1_2/trans-gen2.c
> @@ -546,8 +546,10 @@ int iwl_trans_pcie_gen2_start_fw(struct iwl_trans
> *trans,
> }
>
> if (WARN_ON(trans->do_top_reset &&
> - trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_SC))
> - return -EINVAL;
> + trans->mac_cfg->device_family < IWL_DEVICE_FAMILY_SC))
> {
> + ret = -EINVAL;
> + goto out;
> + }
>
> /* we need to wait later - set state */
> if (trans->do_top_reset)
> --
> 2.47.2
Hi Dan,
Thanks for your patch, but we already have such a patch internally,
which will be sent soon.
Miri
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-06-25 17:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-25 15:22 [PATCH] wifi: iwlwifi: pcie: unlock on error in iwl_trans_pcie_gen2_start_fw() Dan Carpenter
2025-06-25 17:44 ` Korenblit, Miriam Rachel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox