Merge "msm: pcie: update with link power on check for user PCIe resume" (3fc748c6) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/pci/controller/pci-msm.c

+3 −5

Original line number	Diff line number	Diff line
		@@ -7298,12 +7298,10 @@ int msm_pcie_pm_control(enum msm_pcie_pm_opt pm_opt, u32 busnr, void *user,
		break;
		}

		if (msm_pcie_dev[rc_idx].link_status !=
		MSM_PCIE_LINK_DISABLED) {
		if (msm_pcie_dev[rc_idx].power_on) {
		PCIE_ERR(&msm_pcie_dev[rc_idx],
		"PCIe: RC%d: requested to resume when link is not disabled:%d. Number of active EP(s): %d\n",
		rc_idx, msm_pcie_dev[rc_idx].link_status,
		msm_pcie_dev[rc_idx].num_active_ep);
		"PCIe: RC%d: requested to resume when link is already powered on. Number of active EP(s): %d\n",
		rc_idx, msm_pcie_dev[rc_idx].num_active_ep);
		break;
		}