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

Commit 3f896899 authored by Chris Lew's avatar Chris Lew
Browse files

rpmsg: glink: spi: unregister rpdev during ept destroy 



Rpmsg device unregister is not happening if channel close is triggered
from local side and causing re-registration of device failures.

Unregister rpmsg device for local close in endpoint destroy path.

Change-Id: Ic0c66346577cf63546c13b341c6313a8d478d8e5
Signed-off-by: default avatarChris Lew <clew@codeaurora.org>
parent 467a83db

drivers/rpmsg/qcom_glink_spi.c

+9 −0
Original line number Diff line number Diff line
@@ -1594,6 +1594,7 @@ static void glink_spi_destroy_ept(struct rpmsg_endpoint *ept) 
{

	struct glink_channel *channel = to_glink_channel(ept);

	struct glink_spi *glink = channel->glink;

	struct rpmsg_channel_info chinfo;

	unsigned long flags;



	spin_lock_irqsave(&channel->recv_lock, flags);
@@ -1601,6 +1602,13 @@ static void glink_spi_destroy_ept(struct rpmsg_endpoint *ept) 
	spin_unlock_irqrestore(&channel->recv_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;



	glink_spi_send_close_req(glink, channel);
@@ -1629,6 +1637,7 @@ static void glink_spi_rx_close(struct glink_spi *glink, unsigned int rcid) 


		rpmsg_unregister_device(&glink->dev, &chinfo);

	}

	channel->rpdev = NULL;



	glink_spi_send_close_ack(glink, channel->rcid);