Instead of filling in the struct v4l2_capability device_caps
field, fill in the struct video_device device_caps field.

That way the V4L2 core knows what the capabilities of the
video device are.

Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl>
---
 drivers/media/platform/omap/omap_vout.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/omap/omap_vout.c 
b/drivers/media/platform/omap/omap_vout.c
index cb6a9e3946b6..29f9c2a3ce2b 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -1044,10 +1044,6 @@ static int vidioc_querycap(struct file *file, void *fh,
        strscpy(cap->driver, VOUT_NAME, sizeof(cap->driver));
        strscpy(cap->card, vout->vfd->name, sizeof(cap->card));
        cap->bus_info[0] = '\0';
-       cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |
-               V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
-       cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
-
        return 0;
 }
 
@@ -1870,6 +1866,8 @@ static int __init omap_vout_setup_video_data(struct 
omap_vout_device *vout)
        vfd->fops = &omap_vout_fops;
        vfd->v4l2_dev = &vout->vid_dev->v4l2_dev;
        vfd->vfl_dir = VFL_DIR_TX;
+       vfd->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |
+                          V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
        mutex_init(&vout->lock);
 
        vfd->minor = -1;
-- 
2.20.1

Reply via email to