Revert "mwifiex: cancel pcie/sdio work in remove/shutdown handler"

This reverts commit b713bbf. The "fix" in question does not actually fix all related problems, and it also introduces new deadlock possibilities. Since commit b014e96 ("PCI: Protect pci_error_handlers->reset_notify() usage with device_lock()"), the race in question is actually resolved (PCIe reset cannot happen at the same time as remove()). Instead, this "fix" just introduces a deadlock where mwifiex_pcie_card_reset_work() is waiting on device_lock, which is held by PCIe device remove(), which is waiting on...mwifiex_pcie_card_reset_work(). The proper thing to do is just to fix the deadlock. Patch for this will come separately. Cc: Signed-off-by: Xinming Hu <[email protected]> Signed-off-by: Brian Norris <[email protected]> Signed-off-by: Kalle Valo <[email protected]>
alxsad · Jan 16, 2018 · 7e34c0d · 7e34c0d
1 parent 7e2c492
commit 7e34c0d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -310,8 +310,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev)
 		mwifiex_init_shutdown_fw(priv, MWIFIEX_FUNC_SHUTDOWN);
 	}
 
-	cancel_work_sync(&card->work);
-
 	mwifiex_remove_card(adapter);
 }
 

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -399,8 +399,6 @@ mwifiex_sdio_remove(struct sdio_func *func)
 		mwifiex_init_shutdown_fw(priv, MWIFIEX_FUNC_SHUTDOWN);
 	}
 
-	cancel_work_sync(&card->work);
-
 	mwifiex_remove_card(adapter);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -310,8 +310,6 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev) @@
     		mwifiex_init_shutdown_fw(priv, MWIFIEX_FUNC_SHUTDOWN);
     	}
-    	cancel_work_sync(&card->work);
     	mwifiex_remove_card(adapter);
     }
@@ Expand Down @@