Merge "rpmsg: glink: Remove the rpmsg dev in close_ack" (94f4396e) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/rpmsg/qcom_glink_native.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -1387,9 +1387,6 @@ static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept)
		channel->ept.cb = NULL;
		spin_unlock_irqrestore(&channel->recv_lock, flags);

		/* Decouple the potential rpdev from the channel */
		channel->rpdev = NULL;

		qcom_glink_send_close_req(glink, channel);
		}

		@@ -1714,6 +1711,7 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid)

		rpmsg_unregister_device(glink->dev, &chinfo);
		}
		channel->rpdev = NULL;

		qcom_glink_send_close_ack(glink, channel->rcid);

		@@ -1727,6 +1725,7 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid)

		static void qcom_glink_rx_close_ack(struct qcom_glink *glink, unsigned int lcid)
		{
		struct rpmsg_channel_info chinfo;
		struct glink_channel *channel;
		unsigned long flags;

		@@ -1742,6 +1741,16 @@ static void qcom_glink_rx_close_ack(struct qcom_glink *glink, unsigned int lcid)
		channel->lcid = 0;
		spin_unlock_irqrestore(&glink->idr_lock, flags);

		/* Decouple the potential rpdev from the channel */
		if (channel->rpdev) {
		strlcpy(chinfo.name, channel->name, sizeof(chinfo.name));
		chinfo.src = RPMSG_ADDR_ANY;
		chinfo.dst = RPMSG_ADDR_ANY;

		rpmsg_unregister_device(glink->dev, &chinfo);
		}
		channel->rpdev = NULL;

		kref_put(&channel->refcount, qcom_glink_channel_release);
		}