2 files changed, 20 insertions, 10 deletions

diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index bc3331870240..de87247c74ee 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -59,20 +59,25 @@ static int cs53l32a_read(struct i2c_client *client, u8 reg)
 static int cs53l32a_command(struct i2c_client *client, unsigned int cmd,
                             void *arg)
 {
-        struct v4l2_audio *input = arg;
+        struct v4l2_routing *route = arg;
         struct v4l2_control *ctrl = arg;
 
         switch (cmd) {
-        case VIDIOC_S_AUDIO:
+        case VIDIOC_INT_G_AUDIO_ROUTING:
+                route->input = (cs53l32a_read(client, 0x01) >> 4) & 3;
+                route->output = 0;
+                break;
+
+        case VIDIOC_INT_S_AUDIO_ROUTING:
                 /* There are 2 physical inputs, but the second input can be
                    placed in two modes, the first mode bypasses the PGA (gain),
                    the second goes through the PGA. Hence there are three
                    possible inputs to choose from. */
-                if (input->index > 2) {
-                        v4l_err(client, "Invalid input %d.\n", input->index);
+                if (route->input > 2) {
+                        v4l_err(client, "Invalid input %d.\n", route->input);
                         return -EINVAL;
                 }
-                cs53l32a_write(client, 0x01, 0x01 + (input->index << 4));
+                cs53l32a_write(client, 0x01, 0x01 + (route->input << 4));
                 break;
 
         case VIDIOC_G_CTRL:
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index 9b90225226e6..d81a88bbe43d 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -79,21 +79,26 @@ static int wm8775_command(struct i2c_client *client, unsigned int cmd,
                           void *arg)
 {
         struct wm8775_state *state = i2c_get_clientdata(client);
-        struct v4l2_audio *input = arg;
+        struct v4l2_routing *route = arg;
         struct v4l2_control *ctrl = arg;
 
         switch (cmd) {
-        case VIDIOC_S_AUDIO:
+        case VIDIOC_INT_G_AUDIO_ROUTING:
+                route->input = state->input;
+                route->output = 0;
+                break;
+
+        case VIDIOC_INT_S_AUDIO_ROUTING:
                 /* There are 4 inputs and one output. Zero or more inputs
                    are multiplexed together to the output. Hence there are
                    16 combinations.
                    If only one input is active (the normal case) then the
                    input values 1, 2, 4 or 8 should be used. */
-                if (input->index > 15) {
-                        v4l_err(client, "Invalid input %d.\n", input->index);
+                if (route->input > 15) {
+                        v4l_err(client, "Invalid input %d.\n", route->input);
                         return -EINVAL;
                 }
-                state->input = input->index;
+                state->input = route->input;
                 if (state->muted)
                         break;
                 wm8775_write(client, R21, 0x0c0);