Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aae55383 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss: Remove unwanted pci resume call during system resume"

parents c0ccdc29 d4e29ff7

drivers/net/wireless/cnss/cnss_pci.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -1527,16 +1527,6 @@ static int cnss_wlan_pci_resume(struct device *dev) 
	if (!wdriver)

	if (!wdriver)

		goto out;

		goto out;





	if (!penv->pcie_link_down_ind) {

		if (msm_pcie_pm_control(MSM_PCIE_RESUME,

			cnss_get_pci_dev_bus_number(pdev),

			pdev, NULL, PM_OPTIONS)) {

			pr_err("%s: Failed to resume PCIe link\n", __func__);

			ret = -EAGAIN;

			goto out;

		}

		penv->pcie_link_state = PCIE_LINK_UP;

	}

	if (wdriver->resume && !penv->pcie_link_down_ind) {

	if (wdriver->resume && !penv->pcie_link_down_ind) {

		if (penv->saved_state)

		if (penv->saved_state)

			pci_load_and_free_saved_state(pdev,

			pci_load_and_free_saved_state(pdev,