From 8e56e8cfdc80464af1d252f2d3f278b3c6282ecd Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 10 Oct 2011 11:09:56 -0300 Subject: [PATCH] --- yaml --- r: 271974 b: refs/heads/master c: 6c6f52fd6024b40297db32acb67f1fce6c6d1ae3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/cx23885-video.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ad3a5e5cee41..75424e47e91e 100644 --- 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 index 396fa4e23acb..7291f64e92bc 100644 --- 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; }