1 files changed, 14 insertions, 25 deletions

diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index 486234d41b56..d04793fb80fc 100644
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -142,8 +142,8 @@ struct mxb
 
         int     cur_mode;       /* current audio mode (mono, stereo, ...) */
         int     cur_input;      /* current input */
-        int     cur_freq;       /* current frequency the tuner is tuned to */
         int     cur_mute;       /* current mute status */
+        struct v4l2_frequency   cur_freq;       /* current frequency the tuner is tuned to */
 };
 
 static struct saa7146_extension extension;
@@ -352,9 +352,15 @@ static int mxb_init_done(struct saa7146_dev* dev)
         /* select a tuner type */
         tun_setup.mode_mask = T_ANALOG_TV;
         tun_setup.addr = ADDR_UNSET;
-        tun_setup.type = 5;
+        tun_setup.type = TUNER_PHILIPS_PAL;
         mxb->tuner->driver->command(mxb->tuner,TUNER_SET_TYPE_ADDR, &tun_setup);
-        
+        /* tune in some frequency on tuner */
+        mxb->cur_freq.tuner = 0;
+        mxb->cur_freq.type = V4L2_TUNER_ANALOG_TV;
+        mxb->cur_freq.frequency = freq;
+        mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_FREQUENCY,
+                                        &mxb->cur_freq);
+
         /* mute audio on tea6420s */
         mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[6][0]);
         mxb->tea6420_2->driver->command(mxb->tea6420_2,TEA6420_SWITCH, &TEA6420_line[6][1]);
@@ -371,12 +377,8 @@ static int mxb_init_done(struct saa7146_dev* dev)
         vm.out = 13;
         mxb->tea6415c->driver->command(mxb->tea6415c,TEA6415C_SWITCH, &vm);
                                 
-        /* tune in some frequency on tuner */
-        mxb->tuner->driver->command(mxb->tuner, VIDIOCSFREQ, &freq);
-
         /* the rest for mxb */
         mxb->cur_input = 0;
-        mxb->cur_freq = freq;
         mxb->cur_mute = 1;
 
         mxb->cur_mode = V4L2_TUNER_MODE_STEREO;
@@ -819,18 +821,14 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                         return -EINVAL;
                 }
 
-                memset(f,0,sizeof(*f));
-                f->type = V4L2_TUNER_ANALOG_TV;
-                f->frequency =  mxb->cur_freq;
+                *f = mxb->cur_freq;
 
-                DEB_EE(("VIDIOC_G_FREQ: freq:0x%08x.\n", mxb->cur_freq));
+                DEB_EE(("VIDIOC_G_FREQ: freq:0x%08x.\n", mxb->cur_freq.frequency));
                 return 0;
         }
         case VIDIOC_S_FREQUENCY:
         {
                 struct v4l2_frequency *f = arg;
-                int t_locked = 0;
-                int v_byte = 0;
 
                 if (0 != f->tuner)
                         return -EINVAL;
@@ -843,20 +841,11 @@ static int mxb_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
                         return -EINVAL;
                 }
 
-                DEB_EE(("VIDIOC_S_FREQUENCY: freq:0x%08x.\n",f->frequency));
-
-                mxb->cur_freq = f->frequency;
+                mxb->cur_freq = *f;
+                DEB_EE(("VIDIOC_S_FREQUENCY: freq:0x%08x.\n", mxb->cur_freq.frequency));
 
                 /* tune in desired frequency */                 
-                mxb->tuner->driver->command(mxb->tuner, VIDIOCSFREQ, &mxb->cur_freq);
-
-                /* check if pll of tuner & saa7111a is locked */
-//              mxb->tuner->driver->command(mxb->tuner,TUNER_IS_LOCKED, &t_locked);
-                mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_GET_STATUS, &v_byte);
-
-                /* not locked -- anything to do here ? */
-                if( 0 == t_locked || 0 == (v_byte & DECODER_STATUS_GOOD)) {
-                }
+                mxb->tuner->driver->command(mxb->tuner, VIDIOC_S_FREQUENCY, &mxb->cur_freq);
 
                 /* hack: changing the frequency should invalidate the vbi-counter (=> alevt) */
                 spin_lock(&dev->slock);