From e221c04562accb2948c6b8c14acbacac53affb92 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Fri, 11 Sep 2009 00:08:44 -0300 Subject: [PATCH] --- yaml --- r: 164075 b: refs/heads/master c: 0414614aab32d84da2bb092eb83b5e456946022d h: refs/heads/master i: 164073: 109fffac0dc1876065ea71a97ccf80e42bdab334 164071: 34b7db23463a1cdd72a623463175ec30594a693b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-video.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 97ed4c0f1b27..d3828d28daca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 290c0cfac9050fa2442e93f35f47e4faa4227e85 +refs/heads/master: 0414614aab32d84da2bb092eb83b5e456946022d diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index a5632c7e6438..8955b7b5365f 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/drivers/media/video/em28xx/em28xx-video.c @@ -1758,11 +1758,13 @@ static int vidioc_querycap(struct file *file, void *priv, cap->version = EM28XX_VERSION_CODE; cap->capabilities = - V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE | V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING; + if (dev->vbi_dev) + cap->capabilities |= V4L2_CAP_VBI_CAPTURE; + if (dev->audio_mode.has_audio) cap->capabilities |= V4L2_CAP_AUDIO;