From: Hans Verkuil Date: Thu, 7 Feb 2013 10:06:21 +0000 (-0300) Subject: [media] s2255: add device_caps support to querycap X-Git-Tag: v3.10-rc1~136^2~544 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39696009d0d4472606b7fb90fc635a0d0fecba60;p=platform%2Fkernel%2Flinux-exynos.git [media] s2255: add device_caps support to querycap Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c index 55c972a..9cb8325 100644 --- a/drivers/media/usb/s2255/s2255drv.c +++ b/drivers/media/usb/s2255/s2255drv.c @@ -821,10 +821,12 @@ static int vidioc_querycap(struct file *file, void *priv, { struct s2255_fh *fh = file->private_data; struct s2255_dev *dev = fh->dev; + strlcpy(cap->driver, "s2255", sizeof(cap->driver)); strlcpy(cap->card, "s2255", sizeof(cap->card)); usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; }