mwifiex: handle an error path correctly

In failure case locks are not allocated in mwifiex_register().
So mwifiex_free_lock_list() routine call becomes redundant.
Also we don't need to check return type for mwifiex_init_lock_list()
routine. It never fails.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
index 8b05b4f5ffe2d4a7299561a0e47d1d8b1c2e4f1f..848645118ad42c8a3c21c9477a1df4ac3e386a17 100644 (file)
--- a/drivers/net/wireless/mwifiex/main.c
+++ b/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]);