3 files changed, 6 insertions, 7 deletions

diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index 6098b626811f..47fee05eaefb 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -576,6 +576,7 @@ static int set_control(struct saa7146_fh *fh, struct v4l2_control *c)
                 vv->vflip = c->value;
                 break;
         default: {
+                mutex_unlock(&dev->lock);
                 return -EINVAL;
         }
         }
diff --git a/drivers/media/common/tuners/mxl5007t.c b/drivers/media/common/tuners/mxl5007t.c
index 64379f2bf237..3ec28945c26f 100644
--- a/drivers/media/common/tuners/mxl5007t.c
+++ b/drivers/media/common/tuners/mxl5007t.c
@@ -657,7 +657,7 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)
 {
         struct mxl5007t_state *state = fe->tuner_priv;
         int rf_locked, ref_locked;
-        s32 rf_input_level;
+        s32 rf_input_level = 0;
         int ret;
 
         if (fe->ops.i2c_gate_ctrl)
diff --git a/drivers/media/common/tuners/tuner-simple.c b/drivers/media/common/tuners/tuner-simple.c
index de7adaf5fa5b..78412c9c424a 100644
--- a/drivers/media/common/tuners/tuner-simple.c
+++ b/drivers/media/common/tuners/tuner-simple.c
@@ -318,7 +318,6 @@ static int simple_std_setup(struct dvb_frontend *fe,
                             u8 *config, u8 *cb)
 {
         struct tuner_simple_priv *priv = fe->tuner_priv;
-        u8 tuneraddr;
         int rc;
 
         /* tv norm specific stuff for multi-norm tuners */
@@ -387,6 +386,7 @@ static int simple_std_setup(struct dvb_frontend *fe,
 
         case TUNER_PHILIPS_TUV1236D:
         {
+                struct tuner_i2c_props i2c = priv->i2c_props;
                 /* 0x40 -> ATSC antenna input 1 */
                 /* 0x48 -> ATSC antenna input 2 */
                 /* 0x00 -> NTSC antenna input 1 */
@@ -398,17 +398,15 @@ static int simple_std_setup(struct dvb_frontend *fe,
                         buffer[1] = 0x04;
                 }
                 /* set to the correct mode (analog or digital) */
-                tuneraddr = priv->i2c_props.addr;
-                priv->i2c_props.addr = 0x0a;
-                rc = tuner_i2c_xfer_send(&priv->i2c_props, &buffer[0], 2);
+                i2c.addr = 0x0a;
+                rc = tuner_i2c_xfer_send(&i2c, &buffer[0], 2);
                 if (2 != rc)
                         tuner_warn("i2c i/o error: rc == %d "
                                    "(should be 2)\n", rc);
-                rc = tuner_i2c_xfer_send(&priv->i2c_props, &buffer[2], 2);
+                rc = tuner_i2c_xfer_send(&i2c, &buffer[2], 2);
                 if (2 != rc)
                         tuner_warn("i2c i/o error: rc == %d "
                                    "(should be 2)\n", rc);
-                priv->i2c_props.addr = tuneraddr;
                 break;
         }
         }