summaryrefslogtreecommitdiff
path: root/drivers/media/video/cx23885
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2011-10-10 18:09:56 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-10-15 00:21:34 +0400
commit6c6f52fd6024b40297db32acb67f1fce6c6d1ae3 (patch)
treee0d48d106a2a3e0e4ce9afd4bb80166fdcaf5202 /drivers/media/video/cx23885
parentfa1e0fd3718417ad1e1058172fafd8cc2f480618 (diff)
downloadlinux-6c6f52fd6024b40297db32acb67f1fce6c6d1ae3.tar.xz
[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>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c5
1 files changed, 5 insertions, 0 deletions
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;
}