aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>2015-03-15 10:00:17 -0400
committerKalle Valo <kvalo@codeaurora.org>2015-03-20 02:33:17 -0400
commitcec94d8cf5c2e5347ed9264cc94210e6376c7a46 (patch)
treec157dcb91b32036f71d8541dcfb1b467422e3cb2
parent148416a973e0a07fa94a0de90dae92763b282311 (diff)
wil6210: fix check for FW responsiveness
"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>
-rw-r--r--drivers/net/wireless/ath/wil6210/main.c2
-rw-r--r--drivers/net/wireless/ath/wil6210/pcie_bus.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index afff8d33c562..a5fd605e52eb 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -724,6 +724,8 @@ int wil_reset(struct wil6210_priv *wil, bool load_fw)
724 724
725 /* we just started MAC, wait for FW ready */ 725 /* we just started MAC, wait for FW ready */
726 rc = wil_wait_for_fw_ready(wil); 726 rc = wil_wait_for_fw_ready(wil);
727 if (rc == 0) /* check FW is responsive */
728 rc = wmi_echo(wil);
727 } 729 }
728 730
729 return rc; 731 return rc;
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index 25343cffe229..109986114abf 100644
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -246,8 +246,6 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
246 246
247 wil6210_debugfs_init(wil); 247 wil6210_debugfs_init(wil);
248 248
249 /* check FW is alive */
250 wmi_echo(wil);
251 249
252 return 0; 250 return 0;
253 251