Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[media] cx231xx: add device_caps support to QUERYCAP 



This fixes a v4l2_compliance failure.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e74d7e6d

drivers/media/usb/cx231xx/cx231xx-video.c

+10 −6
Original line number Diff line number Diff line
@@ -1854,6 +1854,7 @@ static int vidioc_streamoff(struct file *file, void *priv, 
static int vidioc_querycap(struct file *file, void *priv,

			   struct v4l2_capability *cap)

{

	struct video_device *vdev = video_devdata(file);

	struct cx231xx_fh *fh = priv;

	struct cx231xx *dev = fh->dev;
@@ -1861,17 +1862,20 @@ static int vidioc_querycap(struct file *file, void *priv, 
	strlcpy(cap->card, cx231xx_boards[dev->model].name, sizeof(cap->card));

	usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info));



	cap->capabilities = V4L2_CAP_VBI_CAPTURE |

#if 0

		V4L2_CAP_SLICED_VBI_CAPTURE |

#endif

		V4L2_CAP_VIDEO_CAPTURE	|

	cap->device_caps =

		V4L2_CAP_AUDIO		|

		V4L2_CAP_READWRITE	|

		V4L2_CAP_STREAMING;



	if (vdev->vfl_type == VFL_TYPE_VBI)

		cap->device_caps |= V4L2_CAP_VBI_CAPTURE;

	else

		cap->device_caps |= V4L2_CAP_VIDEO_CAPTURE;

	if (dev->tuner_type != TUNER_ABSENT)

		cap->capabilities |= V4L2_CAP_TUNER;

		cap->device_caps |= V4L2_CAP_TUNER;

	cap->capabilities = cap->device_caps |

		V4L2_CAP_VBI_CAPTURE | V4L2_CAP_VIDEO_CAPTURE |

		V4L2_CAP_DEVICE_CAPS;



	return 0;

}