[PATCH RESEND v2 06/11] mwifiex: resolve suspend() race with async FW init failure

[Xinming Hu]

From: Brian Norris <briannor...@chromium.org>

Signed-off-by: Brian Norris <briannor...@chromium.org>
---
v2: Same as v1
---
 drivers/net/wireless/marvell/mwifiex/pcie.c | 12 ++++++++++--
 drivers/net/wireless/marvell/mwifiex/sdio.c | 12 ++++++++++--
 drivers/net/wireless/marvell/mwifiex/usb.c  | 12 ++++++++++--
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c 
b/drivers/net/wireless/marvell/mwifiex/pcie.c
index a2353f9..4d96683 100644
--- 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 a2257a4..39ffe7d 100644
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -285,8 +285,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 {
@@ -294,7 +294,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 558a7f1..671702c 100644
--- 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,
-- 
1.8.1.4