---

yaml --- r: 271974 b: refs/heads/master c: 6c6f52f h: refs/heads/master v: v3
git-mirror · Oct 14, 2011 · 8e56e8c · 8e56e8c
1 parent 7cad8c1
commit 8e56e8c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa1e0fd3718417ad1e1058172fafd8cc2f480618
+refs/heads/master: 6c6f52fd6024b40297db32acb67f1fce6c6d1ae3
diff --git a/trunk/drivers/media/video/cx23885/cx23885-video.c b/trunk/drivers/media/video/cx23885/cx23885-video.c
@@ -1278,6 +1278,11 @@ static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
 		i->type = V4L2_INPUT_TYPE_TUNER;
 		i->std = CX23885_NORMS;
 	}
+
+	/* Two selectable audio inputs for non-tv inputs */
+	if (INPUT(n)->type != CX23885_VMUX_TELEVISION)
+		i->audioset = 0x3;
+
 	return 0;
 }