wil6210: fix check for FW responsiveness
authorVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Sun, 15 Mar 2015 14:00:17 +0000 (16:00 +0200)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 20 Mar 2015 06:33:17 +0000 (08:33 +0200)
"echo" used to be called when no firmware loaded to the NIC,
this causes error output.

Probe firmware with "echo" only after it returned "ready" event.

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ath/wil6210/main.c
drivers/net/wireless/ath/wil6210/pcie_bus.c

index afff8d33c562abc5b3478b128776c6fa18f416f4..a5fd605e52eb8cca8d54ae46f395d95087219bc0 100644 (file)
@@ -724,6 +724,8 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)
 
                /* we just started MAC, wait for FW ready */
                rc = wil_wait_for_fw_ready(wil);
+               if (rc == 0) /* check FW is responsive */
+                       rc = wmi_echo(wil);
        }
 
        return rc;
index 25343cffe229e08fc45f0f582202f3f9ff6bce07..109986114abfa10d6bd6083fa52fb29de2912fea 100644 (file)
@@ -246,8 +246,6 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        wil6210_debugfs_init(wil);
 
-       /* check FW is alive */
-       wmi_echo(wil);
 
        return 0;