From: Felix Fietkau <nbd@nbd.name>
Date: Fri, 4 Nov 2016 12:22:42 +0000 (+0100)
Subject: Revert "mwl8k: remove synchronous device init hack"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=17ecd879b81cce6311009957ec9650baebd82ec7;p=openwrt%2Fstaging%2Frobimarko.git

Revert "mwl8k: remove synchronous device init hack"

This reverts commit cb037d1842d93b37457c896a8949e135ed6e0065.
See 6aa07b82027f for more information

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch
new file mode 100644
index 0000000000..357faee4bf
--- /dev/null
+++ b/package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch
@@ -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;