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

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

Merge "msm: pci: use local pointer for rpmsg_device while sending rpmsg"

parents c75c3d98 7e8531e8

drivers/pci/controller/pci-msm.c

+3 −1
Original line number Diff line number Diff line
@@ -6925,8 +6925,10 @@ static int msm_pcie_drv_send_rpmsg(struct msm_pcie_dev_t *pcie_dev, 
{

	struct msm_pcie_drv_info *drv_info = pcie_dev->drv_info;

	int ret;

	struct rpmsg_device *rpdev;



	mutex_lock(&pcie_drv.rpmsg_lock);

	rpdev = pcie_drv.rpdev;

	if (!pcie_drv.rpdev) {

		ret = -EIO;

		goto out;
@@ -6943,7 +6945,7 @@ static int msm_pcie_drv_send_rpmsg(struct msm_pcie_dev_t *pcie_dev, 
	PCIE_DBG(pcie_dev, "PCIe: RC%d: DRV: sending rpmsg: command: 0x%x\n",

		pcie_dev->rc_idx, msg->pkt.dword[0]);



	ret = rpmsg_trysend(pcie_drv.rpdev->ept, msg, sizeof(*msg));

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

	if (ret) {

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

			pcie_dev->rc_idx);