Merge tag 'rpmsg-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...

[linux-2.6-microblaze.git] / drivers / rpmsg / qcom_glink_native.c

diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c
index 89c3381..01d2805 100644 (file)
--- a/drivers/rpmsg/qcom_glink_native.c
+++ b/drivers/rpmsg/qcom_glink_native.c
@@ -966,6 +966,7 @@ static void qcom_glink_handle_intent(struct qcom_glink *glink,
        spin_unlock_irqrestore(&glink->idr_lock, flags);
        if (!channel) {
                dev_err(glink->dev, "intents for non-existing channel\n");
+               qcom_glink_rx_advance(glink, ALIGN(msglen, 8));
                return;
        }
 
@@ -1454,6 +1455,7 @@ static void qcom_glink_rpdev_release(struct device *dev)
 {
        struct rpmsg_device *rpdev = to_rpmsg_device(dev);
 
+       kfree(rpdev->driver_override);
        kfree(rpdev);
 }
 
@@ -1697,6 +1699,7 @@ static void qcom_glink_device_release(struct device *dev)
 
        /* Release qcom_glink_alloc_channel() reference */
        kref_put(&channel->refcount, qcom_glink_channel_release);
+       kfree(rpdev->driver_override);
        kfree(rpdev);
 }