Merge "cnss: Re-probe when WLAN probe fails" (fef69eed) · Commits · e / devices / android_kernel_sony_msm8994

drivers/net/wireless/cnss/cnss.c

+18 −2

Original line number	Diff line number	Diff line
		@@ -436,6 +436,7 @@ struct pci_driver cnss_wlan_pci_driver = {
		int cnss_wlan_register_driver(struct cnss_wlan_driver *driver)
		{
		int ret = 0;
		int probe_again = 0;
		struct cnss_wlan_driver *wdrv;
		struct cnss_wlan_vreg_info *vreg_info;
		struct cnss_wlan_gpio_info *gpio_info;
		@@ -456,6 +457,7 @@ int cnss_wlan_register_driver(struct cnss_wlan_driver *driver)
		return -EEXIST;
		}

		again:
		ret = cnss_wlan_vreg_set(vreg_info, VREG_ON);
		if (ret) {
		pr_err("wlan vreg ON failed\n");
		@@ -502,9 +504,23 @@ int cnss_wlan_register_driver(struct cnss_wlan_driver *driver)

		ret = wdrv->probe(pdev, penv->id);
		if (ret) {
		if (probe_again > 3) {
		pr_err("Failed to probe WLAN\n");
		goto err_wlan_probe;
		}
		pci_save_state(pdev);
		penv->saved_state = pci_store_saved_state(pdev);
		msm_pcie_pm_control(MSM_PCIE_SUSPEND,
		cnss_get_pci_dev_bus_number(pdev),
		NULL, NULL, PM_OPTIONS);
		penv->pcie_link_state = PCIE_LINK_DOWN;
		cnss_wlan_gpio_set(gpio_info, WLAN_EN_LOW);
		usleep(WLAN_ENABLE_DELAY);
		cnss_wlan_vreg_set(vreg_info, VREG_OFF);
		usleep(POWER_ON_DELAY);
		probe_again++;
		goto again;
		}
		}

		if (penv->esoc_desc && pdev && wdrv->modem_status)