---

yaml --- r: 266638 b: refs/heads/master c: 44b815c h: refs/heads/master v: v3
git-mirror · Oct 3, 2011 · a4ea15f · a4ea15f
1 parent f531e60
commit a4ea15f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d85c5fe462fe3531f607fda787e9c80617e35437
+refs/heads/master: 44b815c6b063ddadacc062a28a3e3facc8486f31
diff --git a/trunk/drivers/net/wireless/mwifiex/main.c b/trunk/drivers/net/wireless/mwifiex/main.c
@@ -75,8 +75,7 @@ static int mwifiex_register(void *card, struct mwifiex_if_ops *if_ops,
 	adapter->priv_num++;
 
 	adapter->priv[0]->adapter = adapter;
-	if (mwifiex_init_lock_list(adapter))
-		goto error;
+	mwifiex_init_lock_list(adapter);
 
 	init_timer(&adapter->cmd_timer);
 	adapter->cmd_timer.function = mwifiex_cmd_timeout_func;
@@ -87,8 +86,6 @@ static int mwifiex_register(void *card, struct mwifiex_if_ops *if_ops,
 error:
 	dev_dbg(adapter->dev, "info: leave mwifiex_register with error\n");
 
-	mwifiex_free_lock_list(adapter);
-
 	for (i = 0; i < adapter->priv_num; i++)
 		kfree(adapter->priv[i]);