rpmsg: Don't overwrite release op of rpdev

b0b03b811963 ("rpmsg: Release rpmsg devices in backends") attempted to
correct the ownership of freeing rpmsg device memory. But the patch
is not complete, in that the rpmsg core will overwrite the release op as
the device is being registered.

Fixes: b0b03b811963 ("rpmsg: Release rpmsg devices in backends")
Reported-by: Henri Roosen <henri.roosen@ginzinger.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
index 600f5f9f743100d459ec547ccaa1f6a96c632cd3..c89edaf6133b573ebfbed30dbd383294975b8361 100644 (file)
--- a/drivers/rpmsg/rpmsg_core.c
+++ b/drivers/rpmsg/rpmsg_core.c
@@ -461,13 +461,6 @@ static struct bus_type rpmsg_bus = {
        .remove         = rpmsg_dev_remove,
 };
 
-static void rpmsg_release_device(struct device *dev)
-{
-       struct rpmsg_device *rpdev = to_rpmsg_device(dev);
-
-       kfree(rpdev);
-}
-
 int rpmsg_register_device(struct rpmsg_device *rpdev)
 {
        struct device *dev = &rpdev->dev;
@@ -477,7 +470,6 @@ int rpmsg_register_device(struct rpmsg_device *rpdev)
                     rpdev->id.name, rpdev->src, rpdev->dst);
 
        rpdev->dev.bus = &rpmsg_bus;
-       rpdev->dev.release = rpmsg_release_device;
 
        ret = device_register(&rpdev->dev);
        if (ret) {