From 026a841c6f03eb6000dae9cbdf727e490b74bff0 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 12 Feb 2013 09:21:36 -0300 Subject: [PATCH] --- yaml --- r: 367023 b: refs/heads/master c: 41022fcb3db75c9777bbd05da114c7eb597694df h: refs/heads/master i: 367021: 8f4b66c6d59db9e75f6c9cf1d9aedb41f8abfa8f 367019: 952953e3383084647eb7f994f4d8b0042137e180 367015: 875936b7a00ecdad0d6a38099e4b757614312d3d 367007: b182f3fb7cbca7403a8eb88e9f639c8bf232f06f v: v3 --- [refs] | 2 +- trunk/drivers/media/usb/hdpvr/hdpvr-video.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3e4408cedcd6..63e357bc4ecb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65fe42d6054bb84c4abc4168310bd5d7c462456e +refs/heads/master: 41022fcb3db75c9777bbd05da114c7eb597694df diff --git a/trunk/drivers/media/usb/hdpvr/hdpvr-video.c b/trunk/drivers/media/usb/hdpvr/hdpvr-video.c index e30ece215c87..406eda85f610 100644 --- a/trunk/drivers/media/usb/hdpvr/hdpvr-video.c +++ b/trunk/drivers/media/usb/hdpvr/hdpvr-video.c @@ -538,9 +538,9 @@ static int vidioc_querycap(struct file *file, void *priv, strcpy(cap->driver, "hdpvr"); strcpy(cap->card, "Hauppauge HD PVR"); usb_make_path(dev->udev, cap->bus_info, sizeof(cap->bus_info)); - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | - V4L2_CAP_AUDIO | - V4L2_CAP_READWRITE; + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_AUDIO | + V4L2_CAP_READWRITE; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; }