3 files changed, 41 insertions, 10 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c
index c29206fa3d1b..52966414327d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c
@@ -27,15 +27,6 @@
 #include <media/v4l2-common.h>
 
 
-struct pvr2_msp3400_handler {
-        struct pvr2_hdw *hdw;
-        struct pvr2_i2c_client *client;
-        struct pvr2_i2c_handler i2c_handler;
-        unsigned long stale_mask;
-};
-
-
-
 struct routing_scheme {
         const int *def;
         unsigned int cnt;
@@ -64,6 +55,17 @@ static const struct routing_scheme routing_schemes[] = {
         },
 };
 
+
+struct pvr2_msp3400_handler {
+        struct pvr2_hdw *hdw;
+        struct pvr2_i2c_client *client;
+        struct pvr2_i2c_handler i2c_handler;
+        unsigned long stale_mask;
+};
+
+
+
+
 /* This function selects the correct audio input source */
 static void set_stereo(struct pvr2_msp3400_handler *ctxt)
 {
@@ -180,7 +182,32 @@ int pvr2_i2c_msp3400_setup(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
         return !0;
 }
 
-
+void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd)
+{
+        if (hdw->input_dirty) {
+                struct v4l2_routing route;
+                const struct routing_scheme *sp;
+                unsigned int sid = hdw->hdw_desc->signal_routing_scheme;
+
+                pvr2_trace(PVR2_TRACE_CHIPS, "subdev msp3400 v4l2 set_stereo");
+
+                if ((sid < ARRAY_SIZE(routing_schemes)) &&
+                    ((sp = routing_schemes + sid) != NULL) &&
+                    (hdw->input_val >= 0) &&
+                    (hdw->input_val < sp->cnt)) {
+                        route.input = sp->def[hdw->input_val];
+                } else {
+                        pvr2_trace(PVR2_TRACE_ERROR_LEGS,
+                                   "*** WARNING *** subdev msp3400 set_input:"
+                                   " Invalid routing scheme (%u)"
+                                   " and/or input (%d)",
+                                   sid, hdw->input_val);
+                        return;
+                }
+                route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1);
+                sd->ops->audio->s_routing(sd, &route);
+        }
+}
 
 /*
   Stuff for Emacs to see, in order to encourage consistent editing style:
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.h b/drivers/media/video/pvrusb2/pvrusb2-audio.h
index f7f0a408a9b4..c47c8de3ba06 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-audio.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-audio.h
@@ -26,6 +26,8 @@
 
 int pvr2_i2c_msp3400_setup(struct pvr2_hdw *,struct pvr2_i2c_client *);
 
+#include "pvrusb2-hdw-internal.h"
+void pvr2_msp3400_subdev_update(struct pvr2_hdw *, struct v4l2_subdev *);
 #endif /* __PVRUSB2_AUDIO_H */
 
 /*
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 7269110a3bc2..ff7af062002b 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -38,6 +38,7 @@
 #include "pvrusb2-fx2-cmd.h"
 #include "pvrusb2-wm8775.h"
 #include "pvrusb2-video-v4l.h"
+#include "pvrusb2-audio.h"
 
 #define TV_MIN_FREQ     55250000L
 #define TV_MAX_FREQ    850000000L
@@ -113,6 +114,7 @@ typedef void (*pvr2_subdev_update_func)(struct pvr2_hdw *,
 static const pvr2_subdev_update_func pvr2_module_update_functions[] = {
         [PVR2_CLIENT_ID_WM8775] = pvr2_wm8775_subdev_update,
         [PVR2_CLIENT_ID_SAA7115] = pvr2_saa7115_subdev_update,
+        [PVR2_CLIENT_ID_MSP3400] = pvr2_msp3400_subdev_update,
 };
 
 static const char *module_names[] = {