1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/media/platform/vimc/vimc-common.c b/drivers/media/platform/vimc/vimc-common.c
index c1a74bb2df58..e8e6c6b95db9 100644
--- a/drivers/media/platform/vimc/vimc-common.c
+++ b/drivers/media/platform/vimc/vimc-common.c
@@ -380,6 +380,7 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved,
                          u32 function,
                          u16 num_pads,
                          const unsigned long *pads_flag,
+                         const struct v4l2_subdev_internal_ops *sd_int_ops,
                          const struct v4l2_subdev_ops *sd_ops)
 {
         int ret;
@@ -394,6 +395,7 @@ int vimc_ent_sd_register(struct vimc_ent_device *ved,
 
         /* Initialize the subdev */
         v4l2_subdev_init(sd, sd_ops);
+        sd->internal_ops = sd_int_ops;
         sd->entity.function = function;
         sd->entity.ops = &vimc_ent_sd_mops;
         sd->owner = THIS_MODULE;
@@ -431,9 +433,9 @@ EXPORT_SYMBOL_GPL(vimc_ent_sd_register);
 
 void vimc_ent_sd_unregister(struct vimc_ent_device *ved, struct v4l2_subdev *sd)
 {
-        v4l2_device_unregister_subdev(sd);
         media_entity_cleanup(ved->ent);
         vimc_pads_cleanup(ved->pads);
+        v4l2_device_unregister_subdev(sd);
 }
 EXPORT_SYMBOL_GPL(vimc_ent_sd_unregister);