Revert "mwl8k: remove synchronous device init hack"

This reverts commit cb037d1842.
See 6aa07b8202 for more information

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-11-04 13:22:42 +01:00
parent 57fb5c08f5
commit 17ecd879b8
1 changed files with 20 additions and 0 deletions

View File

@ -0,0 +1,20 @@
--- a/drivers/net/wireless/marvell/mwl8k.c
+++ b/drivers/net/wireless/marvell/mwl8k.c
@@ -6264,6 +6264,8 @@ static int mwl8k_probe(struct pci_dev *p
priv->running_bsses = 0;
+ wait_for_completion(&priv->firmware_loading_complete);
+
return rc;
err_stop_firmware:
@@ -6297,8 +6299,6 @@ static void mwl8k_remove(struct pci_dev
return;
priv = hw->priv;
- wait_for_completion(&priv->firmware_loading_complete);
-
if (priv->fw_state == FW_STATE_ERROR) {
mwl8k_hw_reset(priv);
goto unmap;