aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rpmsg
diff options
context:
space:
mode:
authorBjorn Andersson <bjorn.andersson@linaro.org>2017-06-25 15:05:15 -0700
committerBjorn Andersson <bjorn.andersson@linaro.org>2017-06-26 22:39:56 -0700
commitfa1b85914dfb1cf82edcc1fd5a1fa9d22e8c97e3 (patch)
treebad346127ef4c703c459a18e4325ad312569407d /drivers/rpmsg
parentrpmsg: virtio_rpmsg_bus: cleanup multiple assignment to ops (diff)
downloadlinux-dev-fa1b85914dfb1cf82edcc1fd5a1fa9d22e8c97e3.tar.xz
linux-dev-fa1b85914dfb1cf82edcc1fd5a1fa9d22e8c97e3.zip
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>
Diffstat (limited to 'drivers/rpmsg')
-rw-r--r--drivers/rpmsg/rpmsg_core.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/rpmsg/rpmsg_core.c b/drivers/rpmsg/rpmsg_core.c
index 600f5f9f7431..c89edaf6133b 100644
--- 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) {