diff options
| author | Hans Verkuil <hverkuil-cisco@xs4all.nl> | 2019-06-26 03:16:54 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-07-22 15:09:49 -0400 |
| commit | c7711aba06696c48343cb4616813f6de295a5573 (patch) | |
| tree | d50ddb834e25bd81c9456b03b1c0fc2f8b985b8d /drivers/media/platform/omap/omap_vout.c | |
| parent | 4038b214b88e6962406bcc32e1056f3fb6eb11d7 (diff) | |
| download | linux-stable-c7711aba06696c48343cb4616813f6de295a5573.tar.gz linux-stable-c7711aba06696c48343cb4616813f6de295a5573.tar.bz2 linux-stable-c7711aba06696c48343cb4616813f6de295a5573.zip | |
media: omap_vout: set device_caps in struct video_device
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-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/omap/omap_vout.c')
| -rw-r--r-- | drivers/media/platform/omap/omap_vout.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c index 1f6742536c46..151752de0d02 100644 --- a/drivers/media/platform/omap/omap_vout.c +++ b/drivers/media/platform/omap/omap_vout.c @@ -1039,10 +1039,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; } @@ -1863,6 +1859,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; |