2 files changed, 5 insertions, 3 deletions

diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index b35411160f0..8b21457111b 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -847,7 +847,8 @@ static int set_tvaudio(struct cx88_core *core)
 {
         v4l2_std_id norm = core->tvnorm;
 
-        if (CX88_VMUX_TELEVISION != INPUT(core->input).type)
+        if (CX88_VMUX_TELEVISION != INPUT(core->input).type &&
+            CX88_VMUX_CABLE != INPUT(core->input).type)
                 return 0;
 
         if (V4L2_STD_PAL_BG & norm) {
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 0a3849c710f..f5d1d89bdc2 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -426,12 +426,13 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
                 if (core->board.audio_chip &&
                     core->board.audio_chip == V4L2_IDENT_WM8775) {
                         call_all(core, audio, s_routing,
-                                        INPUT(input).audioroute, 0, 0);
+                                 INPUT(input).audioroute, 0, 0);
                 }
                 /* cx2388's C-ADC is connected to the tuner only.
                    When used with S-Video, that ADC is busy dealing with
                    chroma, so an external must be used for baseband audio */
-                if (INPUT(input).type != CX88_VMUX_TELEVISION ) {
+                if (INPUT(input).type != CX88_VMUX_TELEVISION &&
+                    INPUT(input).type != CX88_VMUX_CABLE) {
                         /* "I2S ADC mode" */
                         core->tvaudio = WW_I2SADC;
                         cx88_set_tvaudio(core);