summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2012-06-14 21:35:26 +0300
committerJohn W. Linville <linville@tuxdriver.com>2012-06-14 14:55:14 -0400
commitdaf67ce8cffd148308ae15c25fb06c1fc20c88f1 (patch)
tree56f72c921204ad6da13f8aa21cd4e26bde0517e9
parent211c17aaee644bb808fbdeef547ac99db92c01ed (diff)
iwlwifi: unlock on error pathmaster-2012-06-14
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> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-drv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-drv.c b/drivers/net/wireless/iwlwifi/iwl-drv.c
index 095547b37a27..a175997e7829 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;
}