[media] v4l: vsp1: Don't register media device when userspace API is disabled

The media device doesn't need to be exposed to userspace when the VSP is
fully controlled by the DU driver. Don't register it in that case.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index 7e3b9da5aa11ef215cc20cfc9f80948709c28cf7..71fd614c1412be9278088ed198b925d41c438d3e 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -206,7 +206,8 @@ static void vsp1_destroy_entities(struct vsp1_device *vsp1)
        }
 
        v4l2_device_unregister(&vsp1->v4l2_dev);
-       media_device_unregister(&vsp1->media_dev);
+       if (vsp1->info->uapi)
+               media_device_unregister(&vsp1->media_dev);
        media_device_cleanup(&vsp1->media_dev);
 
        if (!vsp1->info->uapi)
@@ -381,14 +382,15 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
        /* Register subdev nodes if the userspace API is enabled or initialize
         * the DRM pipeline otherwise.
         */
-       if (vsp1->info->uapi)
+       if (vsp1->info->uapi) {
                ret = v4l2_device_register_subdev_nodes(&vsp1->v4l2_dev);
-       else
-               ret = vsp1_drm_init(vsp1);
-       if (ret < 0)
-               goto done;
+               if (ret < 0)
+                       goto done;
 
-       ret = media_device_register(mdev);
+               ret = media_device_register(mdev);
+       } else {
+               ret = vsp1_drm_init(vsp1);
+       }
 
 done:
        if (ret < 0)