From 2a5bb1e5f3091f3fd09c1b504bd44b7bb908cd98 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 14 Jun 2012 21:35:26 +0300 Subject: [PATCH] --- yaml --- r: 314483 b: refs/heads/master c: daf67ce8cffd148308ae15c25fb06c1fc20c88f1 h: refs/heads/master i: 314481: 047a09d656f5277225e4b88b9ac5054aa965744b 314479: f3e15fcdc811304b9b7b4e24c034faff41cb7489 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-drv.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 366de95af072..9e36415dd15f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 211c17aaee644bb808fbdeef547ac99db92c01ed +refs/heads/master: daf67ce8cffd148308ae15c25fb06c1fc20c88f1 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c b/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c index 095547b37a27..a175997e7829 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-drv.c +++ b/trunk/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; }