2022-04-22 22:41:05

by Arnaud Pouliquen

Subject: [PATCH] rpmsg: virtio: Fix the unregistration of the device rpmsg_ctrl

Unregister the rpmsg_ctrl device instead of just freeing the
the virtio_rpmsg_channel structure.
This will properly unregister the device and call
virtio_rpmsg_release_device() that frees the structure.

Fixes: c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device")

Signed-off-by: Arnaud Pouliquen <[email protected]>
Cc: Hangyu Hua <[email protected]>
---
drivers/rpmsg/virtio_rpmsg_bus.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
index 3b7b47f785cf..0db8043e6c49 100644
--- a/drivers/rpmsg/virtio_rpmsg_bus.c
+++ b/drivers/rpmsg/virtio_rpmsg_bus.c
@@ -861,7 +861,7 @@ static void rpmsg_virtio_del_ctrl_dev(struct rpmsg_device *rpdev_ctrl)
{
if (!rpdev_ctrl)
return;
- kfree(to_virtio_rpmsg_channel(rpdev_ctrl));
+ device_unregister(&rpdev_ctrl->dev);
}

static int rpmsg_probe(struct virtio_device *vdev)
--
2.24.3

2022-04-24 23:46:48

by Hangyu Hua

Subject: Re: [PATCH] rpmsg: virtio: Fix the unregistration of the device rpmsg_ctrl

On 2022/4/22 23:54, Arnaud Pouliquen wrote:
> Unregister the rpmsg_ctrl device instead of just freeing the
> the virtio_rpmsg_channel structure.
> This will properly unregister the device and call
> virtio_rpmsg_release_device() that frees the structure.
>
> Fixes: c486682ae1e2 ("rpmsg: virtio: Register the rpmsg_char device")
>
> Signed-off-by: Arnaud Pouliquen <[email protected]>
> Cc: Hangyu Hua <[email protected]>
> ---
> drivers/rpmsg/virtio_rpmsg_bus.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/rpmsg/virtio_rpmsg_bus.c b/drivers/rpmsg/virtio_rpmsg_bus.c
> index 3b7b47f785cf..0db8043e6c49 100644
> --- a/drivers/rpmsg/virtio_rpmsg_bus.c
> +++ b/drivers/rpmsg/virtio_rpmsg_bus.c
> @@ -861,7 +861,7 @@ static void rpmsg_virtio_del_ctrl_dev(struct rpmsg_device *rpdev_ctrl)
> {
> if (!rpdev_ctrl)
> return;
> - kfree(to_virtio_rpmsg_channel(rpdev_ctrl));
> + device_unregister(&rpdev_ctrl->dev);
> }
>
> static int rpmsg_probe(struct virtio_device *vdev)


Thanks for further optimization.

Reviewed-by: Hangyu Hua <[email protected]>

Thanks,
Hangyu