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

Commit cdc8ff0d authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: pcie: update to use rpmsg_trysend instead of rpmsg_send"

parents 376a4a3b 25a5e3df

drivers/pci/controller/pci-msm.c

+3 −2
Original line number Diff line number Diff line
@@ -6937,7 +6937,8 @@ static int msm_pcie_drv_resume(struct msm_pcie_dev_t *pcie_dev) 
		if (unlikely(drv_info->seq == MSM_PCIE_DRV_SEQ_RESV))

			drv_info->seq = 0;



		ret = rpmsg_send(rpdev->ept, drv_disable, sizeof(*drv_disable));

		ret = rpmsg_trysend(rpdev->ept, drv_disable,

					sizeof(*drv_disable));

		if (!ret) {

			ret = wait_for_completion_timeout(&drv_info->completion,

					msecs_to_jiffies(drv_info->timeout_ms));
@@ -6999,7 +7000,7 @@ static int msm_pcie_drv_suspend(struct msm_pcie_dev_t *pcie_dev) 
	if (unlikely(drv_info->seq == MSM_PCIE_DRV_SEQ_RESV))

		drv_info->seq = 0;



	ret = rpmsg_send(rpdev->ept, drv_enable, sizeof(*drv_enable));

	ret = rpmsg_trysend(rpdev->ept, drv_enable, sizeof(*drv_enable));

	if (ret) {

		PCIE_ERR(pcie_dev, "PCIe: RC%d: DRV: failed to send rpmsg\n",

			pcie_dev->rc_idx);