summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-13 22:00:43 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-13 22:00:43 -0300
commit616363dc9d79e05c0660696cc3581b0e8f72f1ff (patch)
treeb850748efa1767b351683e6cc67ecb3fc562bbe2 /linux/drivers
parent8306b11df8e5a5bc5d5a524e82649413736d2735 (diff)
parent76116fc7aa5a5d2ace0de81eac3e183a5d40bc33 (diff)
downloadmediapointer-dvb-s2-616363dc9d79e05c0660696cc3581b0e8f72f1ff.tar.gz
mediapointer-dvb-s2-616363dc9d79e05c0660696cc3581b0e8f72f1ff.tar.bz2
merge: http://linuxtv.org/hg/~awalls/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/cx18/cx18-audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-audio.c b/linux/drivers/media/video/cx18/cx18-audio.c
index 1519e91c6..7a8ad5963 100644
--- a/linux/drivers/media/video/cx18/cx18-audio.c
+++ b/linux/drivers/media/video/cx18/cx18-audio.c
@@ -44,7 +44,7 @@ int cx18_audio_set_io(struct cx18 *cx)
/* handle muxer chips */
v4l2_subdev_call(cx->sd_extmux, audio, s_routing,
- in->audio_input, 0, 0);
+ (u32) in->muxer_input, 0, 0);
err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl,
audio, s_routing, in->audio_input, 0, 0);