diff options
| author |   Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2016-05-13 13:09:25 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-06-28 12:10:42 -0300 |
| commit | aa0bad337ff231882dc8849f2234138281b5c414 (patch) | |
| tree | 7f10430e4ec7bed203388586b791835ab8b2be01 /drivers/media/platform/vsp1/vsp1_drv.c | |
| parent | [media] v4l: vsp1: Base link creation on availability of entities (diff) | |
| download | linux-dev-aa0bad337ff231882dc8849f2234138281b5c414.tar.xz linux-dev-aa0bad337ff231882dc8849f2234138281b5c414.zip | |
[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>
Diffstat (limited to 'drivers/media/platform/vsp1/vsp1_drv.c')
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_drv.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c index 7e3b9da5aa11..71fd614c1412 100644 --- 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) |