From: Steven Toth <stoth@kernellabs.com>
Date: Mon, 10 Oct 2011 14:09:56 +0000 (-0300)
Subject: [media] cx23885: v4l2 api compliance, set the audioset field correctly
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6c6f52fd6024b40297db32acb67f1fce6c6d1ae3;p=linux-beck.git

[media] cx23885: v4l2 api compliance, set the audioset field correctly

Inform applications that multiple audio inputs are available on
non-tv inputs.

Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 396fa4e23acb..7291f64e92bc 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/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;
 }