Commit c7711aba authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 4038b214

drivers/media/platform/omap/omap_vout.c

+2 −4
Original line number Diff line number Diff line
@@ -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;