1 files changed, 1 insertions, 45 deletions

diff --git a/drivers/media/pci/cx25821/cx25821-medusa-video.c b/drivers/media/pci/cx25821/cx25821-medusa-video.c
index 6a92e5c70c2a..22fa04415ccc 100644
--- a/drivers/media/pci/cx25821/cx25821-medusa-video.c
+++ b/drivers/media/pci/cx25821/cx25821-medusa-video.c
@@ -94,8 +94,6 @@ static int medusa_initialize_ntsc(struct cx25821_dev *dev)
         u32 value = 0;
         u32 tmp = 0;
 
-        mutex_lock(&dev->lock);
-
         for (i = 0; i < MAX_DECODERS; i++) {
                 /* set video format NTSC-M */
                 value = cx25821_i2c_read(&dev->i2c_bus[0],
@@ -222,8 +220,6 @@ static int medusa_initialize_ntsc(struct cx25821_dev *dev)
         value |= 0x00080200;
         ret_val = cx25821_i2c_write(&dev->i2c_bus[0], BYP_AB_CTRL, value);
 
-        mutex_unlock(&dev->lock);
-
         return ret_val;
 }
 
@@ -265,8 +261,6 @@ static int medusa_initialize_pal(struct cx25821_dev *dev)
         u32 value = 0;
         u32 tmp = 0;
 
-        mutex_lock(&dev->lock);
-
         for (i = 0; i < MAX_DECODERS; i++) {
                 /* set video format PAL-BDGHI */
                 value = cx25821_i2c_read(&dev->i2c_bus[0],
@@ -397,14 +391,12 @@ static int medusa_initialize_pal(struct cx25821_dev *dev)
         value &= 0xFFF7FDFF;
         ret_val = cx25821_i2c_write(&dev->i2c_bus[0], BYP_AB_CTRL, value);
 
-        mutex_unlock(&dev->lock);
-
         return ret_val;
 }
 
 int medusa_set_videostandard(struct cx25821_dev *dev)
 {
-        int status = STATUS_SUCCESS;
+        int status = 0;
         u32 value = 0, tmp = 0;
 
         if (dev->tvnorm & V4L2_STD_PAL_BG || dev->tvnorm & V4L2_STD_PAL_DK)
@@ -434,8 +426,6 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
         u32 vscale = 0x0;
         const int MAX_WIDTH = 720;
 
-        mutex_lock(&dev->lock);
-
         /* validate the width */
         if (width > MAX_WIDTH) {
                 pr_info("%s(): width %d > MAX_WIDTH %d ! resetting to MAX_WIDTH\n",
@@ -485,8 +475,6 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
                 cx25821_i2c_write(&dev->i2c_bus[0],
                                 VSCALE_CTRL + (0x200 * decoder), vscale);
         }
-
-        mutex_unlock(&dev->lock);
 }
 
 static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
@@ -496,11 +484,8 @@ static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
         u32 tmp = 0;
         u32 disp_cnt_reg = DISP_AB_CNT;
 
-        mutex_lock(&dev->lock);
-
         /* no support */
         if (decoder < VDEC_A || decoder > VDEC_H) {
-                mutex_unlock(&dev->lock);
                 return;
         }
 
@@ -535,8 +520,6 @@ static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
         }
 
         cx25821_i2c_write(&dev->i2c_bus[0], disp_cnt_reg, fld_cnt);
-
-        mutex_unlock(&dev->lock);
 }
 
 /* Map to Medusa register setting */
@@ -587,10 +570,8 @@ int medusa_set_brightness(struct cx25821_dev *dev, int brightness, int decoder)
         int value = 0;
         u32 val = 0, tmp = 0;
 
-        mutex_lock(&dev->lock);
         if ((brightness > VIDEO_PROCAMP_MAX) ||
             (brightness < VIDEO_PROCAMP_MIN)) {
-                mutex_unlock(&dev->lock);
                 return -1;
         }
         ret_val = mapM(VIDEO_PROCAMP_MIN, VIDEO_PROCAMP_MAX, brightness,
@@ -601,7 +582,6 @@ int medusa_set_brightness(struct cx25821_dev *dev, int brightness, int decoder)
         val &= 0xFFFFFF00;
         ret_val |= cx25821_i2c_write(&dev->i2c_bus[0],
                         VDEC_A_BRITE_CTRL + (0x200 * decoder), val | value);
-        mutex_unlock(&dev->lock);
         return ret_val;
 }
 
@@ -611,10 +591,7 @@ int medusa_set_contrast(struct cx25821_dev *dev, int contrast, int decoder)
         int value = 0;
         u32 val = 0, tmp = 0;
 
-        mutex_lock(&dev->lock);
-
         if ((contrast > VIDEO_PROCAMP_MAX) || (contrast < VIDEO_PROCAMP_MIN)) {
-                mutex_unlock(&dev->lock);
                 return -1;
         }
 
@@ -626,7 +603,6 @@ int medusa_set_contrast(struct cx25821_dev *dev, int contrast, int decoder)
         ret_val |= cx25821_i2c_write(&dev->i2c_bus[0],
                         VDEC_A_CNTRST_CTRL + (0x200 * decoder), val | value);
 
-        mutex_unlock(&dev->lock);
         return ret_val;
 }
 
@@ -636,10 +612,7 @@ int medusa_set_hue(struct cx25821_dev *dev, int hue, int decoder)
         int value = 0;
         u32 val = 0, tmp = 0;
 
-        mutex_lock(&dev->lock);
-
         if ((hue > VIDEO_PROCAMP_MAX) || (hue < VIDEO_PROCAMP_MIN)) {
-                mutex_unlock(&dev->lock);
                 return -1;
         }
 
@@ -654,7 +627,6 @@ int medusa_set_hue(struct cx25821_dev *dev, int hue, int decoder)
         ret_val |= cx25821_i2c_write(&dev->i2c_bus[0],
                         VDEC_A_HUE_CTRL + (0x200 * decoder), val | value);
 
-        mutex_unlock(&dev->lock);
         return ret_val;
 }
 
@@ -664,11 +636,8 @@ int medusa_set_saturation(struct cx25821_dev *dev, int saturation, int decoder)
         int value = 0;
         u32 val = 0, tmp = 0;
 
-        mutex_lock(&dev->lock);
-
         if ((saturation > VIDEO_PROCAMP_MAX) ||
             (saturation < VIDEO_PROCAMP_MIN)) {
-                mutex_unlock(&dev->lock);
                 return -1;
         }
 
@@ -687,7 +656,6 @@ int medusa_set_saturation(struct cx25821_dev *dev, int saturation, int decoder)
         ret_val |= cx25821_i2c_write(&dev->i2c_bus[0],
                         VDEC_A_VSAT_CTRL + (0x200 * decoder), val | value);
 
-        mutex_unlock(&dev->lock);
         return ret_val;
 }
 
@@ -699,8 +667,6 @@ int medusa_video_init(struct cx25821_dev *dev)
         int ret_val = 0;
         int i = 0;
 
-        mutex_lock(&dev->lock);
-
         _num_decoders = dev->_max_num_decoders;
 
         /* disable Auto source selection on all video decoders */
@@ -719,13 +685,9 @@ int medusa_video_init(struct cx25821_dev *dev)
         if (ret_val < 0)
                 goto error;
 
-        mutex_unlock(&dev->lock);
-
         for (i = 0; i < _num_decoders; i++)
                 medusa_set_decoderduration(dev, i, _display_field_cnt[i]);
 
-        mutex_lock(&dev->lock);
-
         /* Select monitor as DENC A input, power up the DAC */
         value = cx25821_i2c_read(&dev->i2c_bus[0], DENC_AB_CTRL, &tmp);
         value &= 0xFF70FF70;
@@ -774,14 +736,8 @@ int medusa_video_init(struct cx25821_dev *dev)
         if (ret_val < 0)
                 goto error;
 
-
-        mutex_unlock(&dev->lock);
-
         ret_val = medusa_set_videostandard(dev);
 
-        return ret_val;
-
 error:
-        mutex_unlock(&dev->lock);
         return ret_val;
 }