diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-12 05:57:09 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-12 05:57:09 -0400 |
| commit | ddc4097b77bbb227851a44287acb2fb8a9896cc1 (patch) | |
| tree | 319d098879bed7c45543d983de8becd509701b22 /drivers/media/video/cx18/cx18-audio.c | |
| parent | bec4c99e8637b5b8bd4b0513eacb51da25885e3b (diff) | |
| parent | ae31c1fbdbb18d917b0a1139497c2dbd35886989 (diff) | |
Merge branch 'topic/drvdata-fix' into topic/asoc
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) | |||
| 44 | 44 | ||
| 45 | /* handle muxer chips */ | 45 | /* handle muxer chips */ |
| 46 | v4l2_subdev_call(cx->sd_extmux, audio, s_routing, | 46 | v4l2_subdev_call(cx->sd_extmux, audio, s_routing, |
| 47 | in->audio_input, 0, 0); | 47 | (u32) in->muxer_input, 0, 0); |
| 48 | 48 | ||
| 49 | err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl, | 49 | err = cx18_call_hw_err(cx, cx->card->hw_audio_ctrl, |
| 50 | audio, s_routing, in->audio_input, 0, 0); | 50 | audio, s_routing, in->audio_input, 0, 0); |