From: Laurent Pinchart Date: Sun, 3 Nov 2013 23:28:24 +0000 (-0300) Subject: [media] v4l: omap4iss: Report device caps in response to VIDIOC_QUERYCAP X-Git-Tag: next-20131210~62^2~1^2~28 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=35c71be8c75dbf80d30f37347a5b2be19761f83e;p=karo-tx-linux.git [media] v4l: omap4iss: Report device caps in response to VIDIOC_QUERYCAP Set the v4l2_capability capabilities and device_caps fields correctly. Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c index 31f1b8805711..bab62d762add 100644 --- a/drivers/staging/media/omap4iss/iss_video.c +++ b/drivers/staging/media/omap4iss/iss_video.c @@ -480,9 +480,12 @@ iss_video_querycap(struct file *file, void *fh, struct v4l2_capability *cap) strlcpy(cap->bus_info, "media", sizeof(cap->bus_info)); if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; else - cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; + cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING; + + cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING + | V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT; return 0; }