* [patch -next] iwlwifi: unlock on error path
@ 2012-06-14 18:35 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2012-06-14 18:35 UTC (permalink / raw)
To: Johannes Berg
Cc: Wey-Yi Guy, Intel Linux Wireless, John W. Linville,
linux-wireless, kernel-janitors
We introduced a lock here in ff1ffb850b ("iwlwifi: fix dynamic
loading"). But we missed an error path which needs an unlock.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 095547b..a175997 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -911,8 +911,10 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
const struct iwl_op_mode_ops *ops = op->ops;
drv->op_mode = ops->start(drv->trans, drv->cfg, &drv->fw);
- if (!drv->op_mode)
+ if (!drv->op_mode) {
+ mutex_unlock(&iwlwifi_opmode_table_mtx);
goto out_unbind;
+ }
} else {
load_module = true;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [patch -next] iwlwifi: unlock on error path
@ 2012-06-14 18:35 ` Dan Carpenter
0 siblings, 0 replies; 4+ messages in thread
From: Dan Carpenter @ 2012-06-14 18:35 UTC (permalink / raw)
To: Johannes Berg
Cc: Wey-Yi Guy, Intel Linux Wireless, John W. Linville,
linux-wireless, kernel-janitors
We introduced a lock here in ff1ffb850b ("iwlwifi: fix dynamic
loading"). But we missed an error path which needs an unlock.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 095547b..a175997 100644
--- a/drivers/net/wireless/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/iwlwifi/iwl-drv.c
@@ -911,8 +911,10 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
const struct iwl_op_mode_ops *ops = op->ops;
drv->op_mode = ops->start(drv->trans, drv->cfg, &drv->fw);
- if (!drv->op_mode)
+ if (!drv->op_mode) {
+ mutex_unlock(&iwlwifi_opmode_table_mtx);
goto out_unbind;
+ }
} else {
load_module = true;
}
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [patch -next] iwlwifi: unlock on error path
2012-06-14 18:35 ` Dan Carpenter
@ 2012-06-14 18:38 ` Johannes Berg
-1 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2012-06-14 18:38 UTC (permalink / raw)
To: Dan Carpenter
Cc: Wey-Yi Guy, Intel Linux Wireless, John W. Linville,
linux-wireless, kernel-janitors
On Thu, 2012-06-14 at 21:35 +0300, Dan Carpenter wrote:
> We introduced a lock here in ff1ffb850b ("iwlwifi: fix dynamic
> loading"). But we missed an error path which needs an unlock.
Thanks Dan. John, this is the other merge issue I was talking about :-)
johannes
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [patch -next] iwlwifi: unlock on error path
@ 2012-06-14 18:38 ` Johannes Berg
0 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2012-06-14 18:38 UTC (permalink / raw)
To: Dan Carpenter
Cc: Wey-Yi Guy, Intel Linux Wireless, John W. Linville,
linux-wireless, kernel-janitors
On Thu, 2012-06-14 at 21:35 +0300, Dan Carpenter wrote:
> We introduced a lock here in ff1ffb850b ("iwlwifi: fix dynamic
> loading"). But we missed an error path which needs an unlock.
Thanks Dan. John, this is the other merge issue I was talking about :-)
johannes
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-06-14 18:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-14 18:35 [patch -next] iwlwifi: unlock on error path Dan Carpenter
2012-06-14 18:35 ` Dan Carpenter
2012-06-14 18:38 ` Johannes Berg
2012-06-14 18:38 ` Johannes Berg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.