Merge "cnss: Toggle PCIe EP WLAN_EN on dual-wifi platforms" (c07833e7) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/cnss/cnss_pci.c

+4 −13

Original line number	Diff line number	Diff line
		@@ -502,11 +502,6 @@ static int cnss_wlan_enable_pin_set_state(
		{
		int ret;

		if (!state && penv->dual_wifi_info.is_dual_wifi_enabled) {
		pr_debug("%s:Dual WiFi enabled, skip sleep state\n", __func__);
		return 0;
		}

		if (state)
		goto set_wlan_pin_active;

		@@ -2307,10 +2302,8 @@ again:

		ret = wdrv->probe(pdev, penv->id);
		if (ret) {
		if (!penv->dual_wifi_info.is_dual_wifi_enabled) {
		wcnss_prealloc_check_memory_leak();
		wcnss_pre_alloc_reset();
		}

		if (probe_again > 3) {
		pr_err("Failed to probe WLAN\n");
		@@ -2400,10 +2393,8 @@ void cnss_wlan_unregister_driver(struct cnss_wlan_driver *driver)
		if (wdrv->remove)
		wdrv->remove(pdev);

		if (!penv->dual_wifi_info.is_dual_wifi_enabled) {
		wcnss_prealloc_check_memory_leak();
		wcnss_pre_alloc_reset();
		}

		cnss_msm_pcie_deregister_event(&penv->event_reg);

+7 −1

Original line number	Diff line number	Diff line
		@@ -238,7 +238,7 @@ static int cnss_put_hw_resources(struct device *dev)

		if (!host) {
		pr_err("%s: MMC host is invalid\n", __func__);
		return 0;
		return ret;
		}

		ret = mmc_power_save_host(host);
		@@ -276,6 +276,12 @@ static int cnss_get_hw_resources(struct device *dev)

		host = info->host;

		if (!host) {
		pr_err("%s: MMC Host is Invalid; Enumeration Failed\n",
		__func__);
		return ret;
		}

		ret = regulator_enable(cnss_pdata->regulator.wlan_vreg);
		if (ret) {
		pr_err("%s: Failed to enable wlan vreg\n", __func__);