media: vimc: use new release op

Use the new v4l2_subdev_internal_ops release op to free the
subdev memory only when the last user closed the file handle.

Move v4l2_device_unregister_subdev() to the end of the
vimc_ent_sd_unregister() function since now the unregister_subdev()
call may free the vimc_ent_device struct which is used after the
unregister_subdev() call. So this now has to be done last.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

1 files changed, 15 insertions, 4 deletions

diff --git a/drivers/media/platform/vimc/vimc-sensor.c b/drivers/media/platform/vimc/vimc-sensor.c
index 59195f262623..d7891d3bbeaa 100644
--- a/drivers/media/platform/vimc/vimc-sensor.c
+++ b/drivers/media/platform/vimc/vimc-sensor.c
@@ -301,6 +301,20 @@ static const struct v4l2_ctrl_ops vimc_sen_ctrl_ops = {
         .s_ctrl = vimc_sen_s_ctrl,
 };
 
+static void vimc_sen_release(struct v4l2_subdev *sd)
+{
+        struct vimc_sen_device *vsen =
+                                container_of(sd, struct vimc_sen_device, sd);
+
+        v4l2_ctrl_handler_free(&vsen->hdl);
+        tpg_free(&vsen->tpg);
+        kfree(vsen);
+}
+
+static const struct v4l2_subdev_internal_ops vimc_sen_int_ops = {
+        .release = vimc_sen_release,
+};
+
 static void vimc_sen_comp_unbind(struct device *comp, struct device *master,
                                  void *master_data)
 {
@@ -309,9 +323,6 @@ static void vimc_sen_comp_unbind(struct device *comp, struct device *master,
                                 container_of(ved, struct vimc_sen_device, ved);
 
         vimc_ent_sd_unregister(ved, &vsen->sd);
-        v4l2_ctrl_handler_free(&vsen->hdl);
-        tpg_free(&vsen->tpg);
-        kfree(vsen);
 }
 
 /* Image Processing Controls */
@@ -371,7 +382,7 @@ static int vimc_sen_comp_bind(struct device *comp, struct device *master,
                                    pdata->entity_name,
                                    MEDIA_ENT_F_CAM_SENSOR, 1,
                                    (const unsigned long[1]) {MEDIA_PAD_FL_SOURCE},
-                                   &vimc_sen_ops);
+                                   &vimc_sen_int_ops, &vimc_sen_ops);
         if (ret)
                 goto err_free_hdl;