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

Browse source

This reverts commit b713bbf147.

The "fix" in question does not actually fix all related problems, and it
also introduces new deadlock possibilities. Since commit b014e96d1a
("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 <huxm@marvell.com>
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

...

This commit is contained in:

Brian Norris 2018-01-12 13:08:36 -08:00 • committed by Kalle Valo

parent 7e2c49222b

commit 7e34c0d2f6

2 changed files with 0 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

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

View file

2

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

View file