浏览代码

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>
Vladimir Kondratiev 10 年之前
父节点
当前提交
cec94d8cf5
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 2 0
      drivers/net/wireless/ath/wil6210/main.c
  2. 0 2
      drivers/net/wireless/ath/wil6210/pcie_bus.c

+ 2 - 0
drivers/net/wireless/ath/wil6210/main.c

@@ -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;

+ 0 - 2
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)
 
 	wil6210_debugfs_init(wil);
 
-	/* check FW is alive */
-	wmi_echo(wil);
 
 	return 0;