Merge "cnss2: Fix suspend and resume issue for rome on sa415m" (325a6a8c) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/wireless/cnss2/pci.c

+15 −14

Original line number	Diff line number	Diff line
		@@ -1003,14 +1003,16 @@ static int cnss_pci_suspend(struct device *dev)
		}

		if (pci_priv->pci_link_state == PCI_LINK_UP) {
		ret = cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_SUSPEND);
		if (pci_priv->device_id != QCA6174_DEVICE_ID) {
		ret = cnss_pci_set_mhi_state(pci_priv,
		CNSS_MHI_SUSPEND);
		if (ret) {
		if (driver_ops && driver_ops->resume)
		driver_ops->resume(pci_dev);
		ret = -EAGAIN;
		goto out;
		}

		}
		cnss_set_pci_config_space(pci_priv,
		SAVE_PCI_CONFIG_SPACE);
		pci_disable_device(pci_dev);
		@@ -1103,16 +1105,15 @@ static int cnss_pci_resume_noirq(struct device *dev)
		if (!pci_priv)
		goto out;

		driver_ops = pci_priv->driver_ops;
		if (driver_ops && driver_ops->resume_noirq &&
		!pci_priv->pci_link_down_ind) {
		ret = cnss_set_pci_link(pci_priv, PCI_LINK_UP);
		if (ret)
		goto out;
		pci_priv->pci_link_state = PCI_LINK_UP;

		driver_ops = pci_priv->driver_ops;
		if (driver_ops && driver_ops->resume_noirq &&
		!pci_priv->pci_link_down_ind)
		ret = driver_ops->resume_noirq(pci_dev);

		}
		out:
		return ret;
		}