b96c2569ac
The removed patches were applied upstream. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
20 lines
509 B
Diff
20 lines
509 B
Diff
--- a/drivers/net/wireless/marvell/mwl8k.c
|
|
+++ b/drivers/net/wireless/marvell/mwl8k.c
|
|
@@ -6285,6 +6285,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:
|
|
@@ -6318,8 +6320,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;
|