1 files changed, 42 insertions, 25 deletions

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index ef4d56ea0027..3904b73f52ee 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -426,24 +426,7 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
 
         /* 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 {
-                        /* 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 */
@@ -454,9 +437,19 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
                         route.input = INPUT(input).audioroute;
                         cx88_call_i2c_clients(core,
                                 VIDIOC_INT_S_AUDIO_ROUTING, &route);
-
                 }
-
+                /* 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 ) {
+                        /* "I2S ADC mode" */
+                        core->tvaudio = WW_I2SADC;
+                        cx88_set_tvaudio(core);
+                } else {
+                        /* Normal mode */
+                        cx_write(AUD_I2SCNTL, 0x0);
+                        cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
+                }
         }
 
         return 0;
@@ -773,6 +766,7 @@ static int video_open(struct inode *inode, struct file *file)
         enum v4l2_buf_type type = 0;
         int radio = 0;
 
+        lock_kernel();
         list_for_each_entry(h, &cx8800_devlist, devlist) {
                 if (h->video_dev->minor == minor) {
                         dev  = h;
@@ -788,8 +782,10 @@ static int video_open(struct inode *inode, struct file *file)
                         dev   = h;
                 }
         }
-        if (NULL == dev)
+        if (NULL == dev) {
+                unlock_kernel();
                 return -ENODEV;
+        }
 
         core = dev->core;
 
@@ -798,8 +794,10 @@ static int video_open(struct inode *inode, struct file *file)
 
         /* allocate + initialize per filehandle data */
         fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh)
+        if (NULL == fh) {
+                unlock_kernel();
                 return -ENOMEM;
+        }
         file->private_data = fh;
         fh->dev      = dev;
         fh->radio    = radio;
@@ -827,11 +825,29 @@ static int video_open(struct inode *inode, struct file *file)
                 cx_write(MO_GP0_IO, core->board.radio.gpio0);
                 cx_write(MO_GP1_IO, core->board.radio.gpio1);
                 cx_write(MO_GP2_IO, core->board.radio.gpio2);
-                core->tvaudio = WW_FM;
-                cx88_set_tvaudio(core);
-                cx88_set_stereo(core,V4L2_TUNER_MODE_STEREO,1);
+                if (core->board.radio.audioroute) {
+                        if(core->board.audio_chip &&
+                                core->board.audio_chip == V4L2_IDENT_WM8775) {
+                                struct v4l2_routing route;
+
+                                route.input = core->board.radio.audioroute;
+                                cx88_call_i2c_clients(core,
+                                        VIDIOC_INT_S_AUDIO_ROUTING, &route);
+                        }
+                        /* "I2S ADC mode" */
+                        core->tvaudio = WW_I2SADC;
+                        cx88_set_tvaudio(core);
+                } else {
+                        /* FM Mode */
+                        core->tvaudio = WW_FM;
+                        cx88_set_tvaudio(core);
+                        cx88_set_stereo(core,V4L2_TUNER_MODE_STEREO,1);
+                }
                 cx88_call_i2c_clients(core,AUDC_SET_RADIO,NULL);
         }
+        unlock_kernel();
+
+        atomic_inc(&core->users);
 
         return 0;
 }
@@ -920,7 +936,8 @@ static int video_release(struct inode *inode, struct file *file)
         file->private_data = NULL;
         kfree(fh);
 
-        cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
+        if(atomic_dec_and_test(&dev->core->users))
+                cx88_call_i2c_clients (dev->core, TUNER_SET_STANDBY, NULL);
 
         return 0;
 }