1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 1c38723d3169..b1fedb0f6431 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -1331,7 +1331,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
 
 /* Call with btv->lock down. */
 static void
-set_input(struct bttv *btv, unsigned int input)
+set_input(struct bttv *btv, unsigned int input, unsigned int norm)
 {
         unsigned long flags;
 
@@ -1350,7 +1350,7 @@ set_input(struct bttv *btv, unsigned int input)
         }
         audio_input(btv,(input == bttv_tvcards[btv->c.type].tuner ?
                        TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN));
-        set_tvnorm(btv,btv->tvnorm);
+        set_tvnorm(btv, norm);
         i2c_vidiocschan(btv);
 }
 
@@ -1441,7 +1441,7 @@ static void bttv_reinit_bt848(struct bttv *btv)
 
         init_bt848(btv);
         btv->pll.pll_current = -1;
-        set_input(btv,btv->input);
+        set_input(btv, btv->input, btv->tvnorm);
 }
 
 static int get_control(struct bttv *btv, struct v4l2_control *c)
@@ -2011,8 +2011,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                         return 0;
                 }
 
-                btv->tvnorm = v->norm;
-                set_input(btv,v->channel);
+                set_input(btv, v->channel, v->norm);
                 mutex_unlock(&btv->lock);
                 return 0;
         }
@@ -2148,7 +2147,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
                 if (*i > bttv_tvcards[btv->c.type].video_inputs)
                         return -EINVAL;
                 mutex_lock(&btv->lock);
-                set_input(btv,*i);
+                set_input(btv, *i, btv->tvnorm);
                 mutex_unlock(&btv->lock);
                 return 0;
         }
@@ -4780,7 +4779,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
                 bt848_hue(btv,32768);
                 bt848_sat(btv,32768);
                 audio_mute(btv, 1);
-                set_input(btv,0);
+                set_input(btv, 0, btv->tvnorm);
                 bttv_crop_reset(&btv->crop[0], btv->tvnorm);
                 btv->crop[1] = btv->crop[0]; /* current = default */
                 disclaim_vbi_lines(btv);