From 798e6092a8b64c73e3646ab49dfcdd25eec68f45 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Thu, 7 Feb 2013 07:06:21 -0300 Subject: [PATCH] --- yaml --- r: 366506 b: refs/heads/master c: 39696009d0d4472606b7fb90fc635a0d0fecba60 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/s2255/s2255drv.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e74c472f1492..19154b070cda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44d06d8273e032119c5ae0d0f90bb57ab8118a5b +refs/heads/master: 39696009d0d4472606b7fb90fc635a0d0fecba60 diff --git a/trunk/drivers/media/usb/s2255/s2255drv.c b/trunk/drivers/media/usb/s2255/s2255drv.c index 55c972a0dbed..9cb832517040 100644 --- a/trunk/drivers/media/usb/s2255/s2255drv.c +++ b/trunk/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; }