Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (33 commits)
  V4L/DVB (3604): V4l printk fix
  V4L/DVB (3599c): Whitespace cleanups under Documentation/video4linux
  V4L/DVB (3599b): Whitespace cleanups under drivers/media
  V4L/DVB (3599a): Move drivers/usb/media to drivers/media/video
  V4L/DVB (3599): Implement new routing commands for wm8775 and cs53l32a.
  V4L/DVB (3598): Add bit algorithm adapter for the Conexant CX2341X boards.
  V4L/DVB (3597): Vivi: fix warning: implicit declaration of function 'in_interrupt'
  V4L/DVB (3588): Remove VIDIOC_G/S_AUDOUT from msp3400
  V4L/DVB (3587): Always wake thread after routing change.
  V4L/DVB (3584): Implement V4L2_TUNER_MODE_LANG1_LANG2 audio mode
  V4L/DVB (3582): Implement correct msp3400 input/output routing
  V4L/DVB (3581): Add new media/msp3400.h header containing the routing macros
  V4L/DVB (3580): Last round of msp3400 cleanups before adding routing commands
  V4L/DVB (3579): Move msp_modus to msp3400-kthreads, add JP and KR std detection
  V4L/DVB (3578): Make scart definitions easier to handle
  V4L/DVB (3577): Cleanup audio input handling
  V4L/DVB (3575): Cxusb: fix i2c debug messages for bluebird devices
  V4L/DVB (3574): Cxusb: fix debug messages
  V4L/DVB (3573): Cxusb: remove FIXME: comment in bluebird_patch_dvico_firmware_download
  V4L/DVB (3572): Cxusb: conditionalize gpio write for the medion box
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 8739c64785ef..de87247c74ee 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -59,25 +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));
-                break;
-
-        case VIDIOC_G_AUDIO:
-                memset(input, 0, sizeof(*input));
-                input->index = (cs53l32a_read(client, 0x01) >> 4) & 3;
+                cs53l32a_write(client, 0x01, 0x01 + (route->input << 4));
                 break;
 
         case VIDIOC_G_CTRL: