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

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

Merge "rpmsg: glink: Fix rpmsg_register_device err handling"

parents eff23ea2 dbedb8f1

drivers/rpmsg/qcom_glink_native.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -1614,7 +1614,7 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid, 




		ret = rpmsg_register_device(rpdev);

		ret = rpmsg_register_device(rpdev);

		if (ret)

		if (ret)

			goto free_rpdev;

			goto rcid_remove;





		channel->rpdev = rpdev;

		channel->rpdev = rpdev;

	}

	}
@@ -1622,9 +1622,6 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid, 




	return 0;

	return 0;





free_rpdev:

	CH_INFO(channel, "free_rpdev\n");

	kfree(rpdev);

rcid_remove:

rcid_remove:

	CH_INFO(channel, "rcid_remove\n");

	CH_INFO(channel, "rcid_remove\n");

	spin_lock_irqsave(&glink->idr_lock, flags);

	spin_lock_irqsave(&glink->idr_lock, flags);