diff options
Diffstat (limited to 'drivers/media/pci/cx88/cx88-video.c')
-rw-r--r-- | drivers/media/pci/cx88/cx88-video.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index 1b00615fd395..c7a9be1065c0 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c | |||
@@ -385,8 +385,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input) | |||
385 | /* The wm8775 module has the "2" route hardwired into | 385 | /* The wm8775 module has the "2" route hardwired into |
386 | the initialization. Some boards may use different | 386 | the initialization. Some boards may use different |
387 | routes for different inputs. HVR-1300 surely does */ | 387 | routes for different inputs. HVR-1300 surely does */ |
388 | if (core->board.audio_chip && | 388 | if (core->sd_wm8775) { |
389 | core->board.audio_chip == V4L2_IDENT_WM8775) { | ||
390 | call_all(core, audio, s_routing, | 389 | call_all(core, audio, s_routing, |
391 | INPUT(input).audioroute, 0, 0); | 390 | INPUT(input).audioroute, 0, 0); |
392 | } | 391 | } |
@@ -771,8 +770,7 @@ static int video_open(struct file *file) | |||
771 | cx_write(MO_GP1_IO, core->board.radio.gpio1); | 770 | cx_write(MO_GP1_IO, core->board.radio.gpio1); |
772 | cx_write(MO_GP2_IO, core->board.radio.gpio2); | 771 | cx_write(MO_GP2_IO, core->board.radio.gpio2); |
773 | if (core->board.radio.audioroute) { | 772 | if (core->board.radio.audioroute) { |
774 | if(core->board.audio_chip && | 773 | if (core->sd_wm8775) { |
775 | core->board.audio_chip == V4L2_IDENT_WM8775) { | ||
776 | call_all(core, audio, s_routing, | 774 | call_all(core, audio, s_routing, |
777 | core->board.radio.audioroute, 0, 0); | 775 | core->board.radio.audioroute, 0, 0); |
778 | } | 776 | } |
@@ -959,7 +957,7 @@ static int cx8800_s_aud_ctrl(struct v4l2_ctrl *ctrl) | |||
959 | u32 value,mask; | 957 | u32 value,mask; |
960 | 958 | ||
961 | /* Pass changes onto any WM8775 */ | 959 | /* Pass changes onto any WM8775 */ |
962 | if (core->board.audio_chip == V4L2_IDENT_WM8775) { | 960 | if (core->sd_wm8775) { |
963 | switch (ctrl->id) { | 961 | switch (ctrl->id) { |
964 | case V4L2_CID_AUDIO_MUTE: | 962 | case V4L2_CID_AUDIO_MUTE: |
965 | wm8775_s_ctrl(core, ctrl->id, ctrl->val); | 963 | wm8775_s_ctrl(core, ctrl->id, ctrl->val); |