aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/cx18/cx18-audio.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-05-03 17:24:55 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-05-03 17:24:55 +0900
commit66fdc951720406deb3b0f17094cb16ec623f525d (patch)
tree24f0ea4cc5d563e4e11cb3bdeb0ca86dd28e8cb6 /drivers/media/video/cx18/cx18-audio.c
parentf425752fc66acf1d4e47970ea704ed7d31c14173 (diff)
parent7d27558c4138ac6b3684dea35c2f4379b940a7dd (diff)
Merge branch 'timers/clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
Diffstat (limited to 'drivers/media/video/cx18/cx18-audio.c')
-rw-r--r--drivers/media/video/cx18/cx18-audio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx18/cx18-audio.c b/drivers/media/video/cx18/cx18-audio.c
index 1519e91c677..7a8ad5963de 100644
--- a/drivers/media/video/cx18/cx18-audio.c
+++ b/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);