diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2013-07-22 19:17:50 -0700 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-07-24 11:02:09 -0400 |
| commit | 4cfda67d8f37cc422ad9f181c173a241c913055b (patch) | |
| tree | a9d360c31bba40157b77e21733e2899af5735aa1 /drivers | |
| parent | f3340e6cfd0100d70653fe8a300049420e464deb (diff) | |
| download | linux-4cfda67d8f37cc422ad9f181c173a241c913055b.tar.gz | |
mwifiex: move if_ops.cleanup_if() call
As if_ops.init_if() is called in mwifiex_register(), corresponding cleanup routine should be called in mwifiex_unregister(). Currently it's there in mwifiex_adapter_cleanup(), hence interface specific cleanup is not performed if driver initialization is failed. 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/mwifiex/init.c | 3 | ||||
| -rw-r--r-- | drivers/net/wireless/mwifiex/main.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/init.c b/drivers/net/wireless/mwifiex/init.c index 2a430c9cbd0e..2ef450e99c75 100644 --- a/drivers/net/wireless/mwifiex/init.c +++ b/drivers/net/wireless/mwifiex/init.c @@ -394,9 +394,6 @@ mwifiex_adapter_cleanup(struct mwifiex_adapter *adapter) dev_dbg(adapter->dev, "info: free scan table\n"); - if (adapter->if_ops.cleanup_if) - adapter->if_ops.cleanup_if(adapter); - if (adapter->sleep_cfm) dev_kfree_skb_any(adapter->sleep_cfm); } diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index ef151c58ac14..f26beb7ed022 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -191,6 +191,9 @@ static int mwifiex_unregister(struct mwifiex_adapter *adapter) { s32 i; + if (adapter->if_ops.cleanup_if) + adapter->if_ops.cleanup_if(adapter); + del_timer(&adapter->cmd_timer); /* Free private structures */ |