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

Commit 68efd038 authored by Brian Norris's avatar Brian Norris Committed by Kalle Valo
Browse files

mwifiex: pcie: stop setting/clearing 'surprise_removed' 



These are already handled by mwifiex_shutdown_sw() and
mwifiex_reinit_sw(). Ideally, we'll kill the flag entirely eventually,
as I suspect it breeds race conditions.

Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent fa4651e1

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

+0 −2
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ static void mwifiex_pcie_reset_notify(struct pci_dev *pdev, bool prepare) 
		 * PCIe and HW.

		 */

		mwifiex_shutdown_sw(adapter);

		adapter->surprise_removed = true;

		clear_bit(MWIFIEX_IFACE_WORK_DEVICE_DUMP, &card->work_flags);

		clear_bit(MWIFIEX_IFACE_WORK_CARD_RESET, &card->work_flags);

	} else {
@@ -378,7 +377,6 @@ static void mwifiex_pcie_reset_notify(struct pci_dev *pdev, bool prepare) 
		 * after performing FLR respectively. Reconfigure the software

		 * and firmware including firmware redownload

		 */

		adapter->surprise_removed = false;

		ret = mwifiex_reinit_sw(adapter);

		if (ret) {

			dev_err(&pdev->dev, "reinit failed: %d\n", ret);