mwifiex: resolve suspend() race with async FW init failure

Signed-off-by: Brian Norris <briannorris@chromium.org>
Tested-by: Xinming Hu <huxm@marvell.com>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index cecf1a0..6176cb7 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -118,12 +118,20 @@ static int mwifiex_pcie_suspend(struct device *dev)
        struct pci_dev *pdev = to_pci_dev(dev);
 
        card = pci_get_drvdata(pdev);
-       if (!card || !card->adapter) {
-               pr_err("Card or adapter structure is not valid\n");
+       if (!card) {
+               dev_err(dev, "card structure is not valid\n");
                return 0;
        }
 
+       /* Might still be loading firmware */
+       wait_for_completion(&card->fw_done);
+
        adapter = card->adapter;
+       if (!adapter) {
+               dev_err(dev, "adapter is not valid\n");
+               return 0;
+       }
+
        mwifiex_enable_wake(adapter);
 
        /* Enable the Host Sleep */

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 2f5b01f..5077d56 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -283,8 +283,8 @@ static int mwifiex_sdio_suspend(struct device *dev)
                }
 
                card = sdio_get_drvdata(func);
-               if (!card || !card->adapter) {
-                       pr_err("suspend: invalid card or adapter\n");
+               if (!card) {
+                       dev_err(dev, "suspend: invalid card\n");
                        return 0;
                }
        } else {
@@ -292,7 +292,15 @@ static int mwifiex_sdio_suspend(struct device *dev)
                return 0;
        }
 
+       /* Might still be loading firmware */
+       wait_for_completion(&card->fw_done);
+
        adapter = card->adapter;
+       if (!adapter) {
+               dev_err(dev, "adapter is not valid\n");
+               return 0;
+       }
+
        mwifiex_enable_wake(adapter);
 
        /* Enable the Host Sleep */

diff --git a/drivers/net/wireless/marvell/mwifiex/usb.c b/drivers/net/wireless/marvell/mwifiex/usb.c
index 45c9430..64a4020 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/usb.c
+++ b/drivers/net/wireless/marvell/mwifiex/usb.c
@@ -503,11 +503,19 @@ static int mwifiex_usb_suspend(struct usb_interface *intf, pm_message_t message)
        struct usb_tx_data_port *port;
        int i, j;
 
-       if (!card || !card->adapter) {
-               pr_err("%s: card or card->adapter is NULL\n", __func__);
+       if (!card) {
+               dev_err(&intf->dev, "%s: card is NULL\n", __func__);
                return 0;
        }
+
+       /* Might still be loading firmware */
+       wait_for_completion(&card->fw_done);
+
        adapter = card->adapter;
+       if (!adapter) {
+               dev_err(&intf->dev, "card is not valid\n");
+               return 0;
+       }
 
        if (unlikely(adapter->is_suspended))
                mwifiex_dbg(adapter, WARN,