From a4ea15fb2cf9fd46fe3ccce57d2330043330fdea Mon Sep 17 00:00:00 2001 From: Amitkumar Karwar Date: Thu, 29 Sep 2011 20:43:41 -0700 Subject: [PATCH] --- yaml --- r: 266638 b: refs/heads/master c: 44b815c6b063ddadacc062a28a3e3facc8486f31 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/mwifiex/main.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ef82bb80977f..e131478e5ff5 100644 --- 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 index 8b05b4f5ffe2..848645118ad4 100644 --- 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]);