1 files changed, 31 insertions, 15 deletions

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 1b80f0f700e..c8a5cd5eedf 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -392,25 +392,41 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
                 break;
         }
 
-        if (core->board.mpeg & CX88_MPEG_BLACKBIRD) {
-                /* sets sound input from external adc */
-                if (INPUT(input).audioroute) {
-                        /* The wm8775 module has the "2" route hardwired into
-                           the initialization. Some boards may use different
-                           routes for different inputs. HVR-1300 surely does */
-                        if (core->board.audio_chip &&
-                            core->board.audio_chip == AUDIO_CHIP_WM8775) {
-                                struct v4l2_routing route;
-
-                                route.input = INPUT(input).audioroute;
-                                cx88_call_i2c_clients(core,
-                                        VIDIOC_INT_S_AUDIO_ROUTING,&route);
-                        }
+        /* if there are audioroutes defined, we have an external
+           ADC to deal with audio */
 
+        if (INPUT(input).audioroute) {
+
+                /* 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 &&
+                        INPUT(input).type != CX88_RADIO) {
+                        /* "ADC mode" */
+                        cx_write(AUD_I2SCNTL, 0x1);
                         cx_set(AUD_CTL, EN_I2SIN_ENABLE);
-                } else
+                } else {
+                        /* Normal mode */
+                        cx_write(AUD_I2SCNTL, 0x0);
                         cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
+                }
+
+                /* The wm8775 module has the "2" route hardwired into
+                   the initialization. Some boards may use different
+                   routes for different inputs. HVR-1300 surely does */
+                if (core->board.audio_chip &&
+                    core->board.audio_chip == AUDIO_CHIP_WM8775) {
+                        struct v4l2_routing route;
+
+                        route.input = INPUT(input).audioroute;
+                        cx88_call_i2c_clients(core,
+                                VIDIOC_INT_S_AUDIO_ROUTING,&route);
+
+                }
+
         }
+
         return 0;
 }
 EXPORT_SYMBOL(cx88_video_mux);