From 5f4a12855f8e5254812020616deaf87a811f58a0 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 24 Jan 2012 05:24:36 -0300 Subject: [PATCH] --- yaml --- r: 294887 b: refs/heads/master c: 23268ae5f0447316101ff320ac89d5ee8a0b5f70 h: refs/heads/master i: 294885: 88f2b8a8bcf7eab7675e2b6ae67b8890c7d0c0d8 294883: aac54877da67b59f68e46e1e2f9cd8d024795dcc 294879: 24bd92b0c952ae1ff1c39fe926efd268f53e2459 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7b85b7ad592b..c0d648599d54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4b444369c75604ef6e656969039b1c6b4ca61c5 +refs/heads/master: 23268ae5f0447316101ff320ac89d5ee8a0b5f70 diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index 84ea88dc10ad..5578c1953585 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -819,9 +819,9 @@ static int vidioc_querycap(struct file *file, void *priv, strcpy(cap->driver, "vivi"); strcpy(cap->card, "vivi"); strlcpy(cap->bus_info, dev->v4l2_dev.name, sizeof(cap->bus_info)); - cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | - V4L2_CAP_READWRITE | V4L2_CAP_DEVICE_CAPS; - cap->device_caps = cap->capabilities; + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING | + V4L2_CAP_READWRITE; + cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS; return 0; }