aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-11-04 13:22:42 +0100
committerFelix Fietkau <nbd@nbd.name>2016-11-04 13:23:07 +0100
commit17ecd879b81cce6311009957ec9650baebd82ec7 (patch)
treec8f4a4f773c99ec2fe2898b159766ae809e033d3
parent57fb5c08f53b3ff02d1c84c23275f5eeef30ef7b (diff)
downloadupstream-17ecd879b81cce6311009957ec9650baebd82ec7.tar.gz
upstream-17ecd879b81cce6311009957ec9650baebd82ec7.tar.bz2
upstream-17ecd879b81cce6311009957ec9650baebd82ec7.zip
Revert "mwl8k: remove synchronous device init hack"
This reverts commit cb037d1842d93b37457c896a8949e135ed6e0065. See 6aa07b82027f for more information Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/kernel/mac80211/patches/940-mwl8k_init_devices_synchronously.patch20
1 files changed, 20 insertions, 0 deletions
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;