Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ccdf72f authored by Brian Norris's avatar Brian Norris Committed by Kalle Valo
Browse files

mwifiex: don't pretend to resume while remove()'ing 



The device core will not allow suspend() to race with remove().

Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Tested-by: default avatarXinming Hu <huxm@marvell.com>
Signed-off-by: default avatarAmitkumar Karwar <akarwar@marvell.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent a1beec4b

drivers/net/wireless/marvell/mwifiex/pcie.c

+0 −5
Original line number Diff line number Diff line
@@ -251,11 +251,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev) 
		return;



	if (user_rmmod && !adapter->mfg_mode) {

#ifdef CONFIG_PM_SLEEP

		if (adapter->is_suspended)

			mwifiex_pcie_resume(&pdev->dev);

#endif



		mwifiex_deauthenticate_all(adapter);



		priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);

drivers/net/wireless/marvell/mwifiex/sdio.c

+0 −3
Original line number Diff line number Diff line
@@ -244,9 +244,6 @@ mwifiex_sdio_remove(struct sdio_func *func) 
	mwifiex_dbg(adapter, INFO, "info: SDIO func num=%d\n", func->num);



	if (user_rmmod && !adapter->mfg_mode) {

		if (adapter->is_suspended)

			mwifiex_sdio_resume(adapter->dev);



		mwifiex_deauthenticate_all(adapter);



		priv = mwifiex_get_priv(adapter, MWIFIEX_BSS_ROLE_ANY);

drivers/net/wireless/marvell/mwifiex/usb.c

+0 −5
Original line number Diff line number Diff line
@@ -614,11 +614,6 @@ static void mwifiex_usb_disconnect(struct usb_interface *intf) 
		return;



	if (user_rmmod && !adapter->mfg_mode) {

#ifdef CONFIG_PM

		if (adapter->is_suspended)

			mwifiex_usb_resume(intf);

#endif



		mwifiex_deauthenticate_all(adapter);



		mwifiex_init_shutdown_fw(mwifiex_get_priv(adapter,