mwifiex: move if_ops.cleanup_if() call (4cfda67d) · Commits · 戴 / test

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>

drivers/net/wireless/mwifiex/init.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}

drivers/net/wireless/mwifiex/main.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -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 */

Admin message