1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 477b9b67eaeb..f3ee001f21ca 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1005,6 +1005,9 @@ static int vidioc_g_audio(struct file *file, void *priv, struct v4l2_audio *a)
         struct em28xx_fh   *fh    = priv;
         struct em28xx      *dev   = fh->dev;
 
+        if (!dev->audio_mode.has_audio)
+                return -EINVAL;
+
         switch (a->index) {
         case EM28XX_AMUX_VIDEO:
                 strcpy(a->name, "Television");
@@ -1046,6 +1049,9 @@ static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
         struct em28xx      *dev = fh->dev;
 
 
+        if (!dev->audio_mode.has_audio)
+                return -EINVAL;
+
         if (a->index >= MAX_EM28XX_INPUT)
                 return -EINVAL;
         if (0 == INPUT(a->index)->type)
@@ -1464,9 +1470,11 @@ static int vidioc_querycap(struct file *file, void  *priv,
         cap->capabilities =
                         V4L2_CAP_SLICED_VBI_CAPTURE |
                         V4L2_CAP_VIDEO_CAPTURE |
-                        V4L2_CAP_AUDIO |
                         V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
 
+        if (dev->audio_mode.has_audio)
+                cap->capabilities |= V4L2_CAP_AUDIO;
+
         if (dev->tuner_type != TUNER_ABSENT)
                 cap->capabilities |= V4L2_CAP_TUNER;