diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-fileops.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-fileops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-fileops.c b/drivers/media/video/cx18/cx18-fileops.c index 757982ea3766..4d7d6d5a7f86 100644 --- a/drivers/media/video/cx18/cx18-fileops.c +++ b/drivers/media/video/cx18/cx18-fileops.c | |||
@@ -136,7 +136,7 @@ static void cx18_dualwatch(struct cx18 *cx) | |||
136 | 136 | ||
137 | new_stereo_mode = cx->params.audio_properties & stereo_mask; | 137 | new_stereo_mode = cx->params.audio_properties & stereo_mask; |
138 | memset(&vt, 0, sizeof(vt)); | 138 | memset(&vt, 0, sizeof(vt)); |
139 | cx18_call_i2c_clients(cx, VIDIOC_G_TUNER, &vt); | 139 | cx18_call_all(cx, tuner, g_tuner, &vt); |
140 | if (vt.audmode == V4L2_TUNER_MODE_LANG1_LANG2 && | 140 | if (vt.audmode == V4L2_TUNER_MODE_LANG1_LANG2 && |
141 | (vt.rxsubchans & V4L2_TUNER_SUB_LANG2)) | 141 | (vt.rxsubchans & V4L2_TUNER_SUB_LANG2)) |
142 | new_stereo_mode = dual; | 142 | new_stereo_mode = dual; |
@@ -608,7 +608,7 @@ int cx18_v4l2_close(struct file *filp) | |||
608 | /* Mark that the radio is no longer in use */ | 608 | /* Mark that the radio is no longer in use */ |
609 | clear_bit(CX18_F_I_RADIO_USER, &cx->i_flags); | 609 | clear_bit(CX18_F_I_RADIO_USER, &cx->i_flags); |
610 | /* Switch tuner to TV */ | 610 | /* Switch tuner to TV */ |
611 | cx18_call_i2c_clients(cx, VIDIOC_S_STD, &cx->std); | 611 | cx18_call_all(cx, tuner, s_std, cx->std); |
612 | /* Select correct audio input (i.e. TV tuner or Line in) */ | 612 | /* Select correct audio input (i.e. TV tuner or Line in) */ |
613 | cx18_audio_set_io(cx); | 613 | cx18_audio_set_io(cx); |
614 | if (atomic_read(&cx->ana_capturing) > 0) { | 614 | if (atomic_read(&cx->ana_capturing) > 0) { |
@@ -671,7 +671,7 @@ static int cx18_serialized_open(struct cx18_stream *s, struct file *filp) | |||
671 | /* We have the radio */ | 671 | /* We have the radio */ |
672 | cx18_mute(cx); | 672 | cx18_mute(cx); |
673 | /* Switch tuner to radio */ | 673 | /* Switch tuner to radio */ |
674 | cx18_call_i2c_clients(cx, AUDC_SET_RADIO, NULL); | 674 | cx18_call_all(cx, tuner, s_radio); |
675 | /* Select the correct audio input (i.e. radio tuner) */ | 675 | /* Select the correct audio input (i.e. radio tuner) */ |
676 | cx18_audio_set_io(cx); | 676 | cx18_audio_set_io(cx); |
677 | /* Done! Unmute and continue. */ | 677 | /* Done! Unmute and continue. */ |