diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-04-30 17:36:52 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-04-30 17:36:52 +0200 |
| commit | 912bc6ae3de99c7bada4577d4341ace4ee59b5be (patch) | |
| tree | 28fd1a4bb9e4b05aa833285b46df169f12c0e24d /drivers/media/video/cx18/cx18-audio.c | |
| parent | nls: add a nls_nullsize inline (diff) | |
| parent | Linux 2.6.30-rc4 (diff) | |
| download | linux-912bc6ae3de99c7bada4577d4341ace4ee59b5be.tar.xz linux-912bc6ae3de99c7bada4577d4341ace4ee59b5be.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/cx18/cx18-audio.c')
| -rw-r--r-- | drivers/media/video/cx18/cx18-audio.c | 2 |
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 1519e91c677a..7a8ad5963de8 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); |