Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[pandora-kernel.git] / drivers / media / video / mxb.c

diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index c1fc6dc..9f01f14 100644 (file)
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -169,7 +169,11 @@ static struct saa7146_extension extension;
 static int mxb_probe(struct saa7146_dev *dev)
 {
        struct mxb *mxb = NULL;
+       int err;
 
+       err = saa7146_vv_devinit(dev);
+       if (err)
+               return err;
        mxb = kzalloc(sizeof(struct mxb), GFP_KERNEL);
        if (mxb == NULL) {
                DEB_D(("not enough kernel memory.\n"));
@@ -294,7 +298,7 @@ static int mxb_init_done(struct saa7146_dev* dev)
        /* select tuner-output on saa7111a */
        i = 0;
        saa7111a_call(mxb, video, s_routing, SAA7115_COMPOSITE0,
-               SAA7111_FMT_CCIR | SAA7111_VBI_BYPASS, 0);
+               SAA7111_FMT_CCIR, 0);
 
        /* select a tuner type */
        tun_setup.mode_mask = T_ANALOG_TV;
@@ -518,8 +522,8 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
                return err;
 
        /* switch video in saa7111a */
-       if (saa7111a_call(mxb, video, s_routing, i, 0, 0))
-               printk(KERN_ERR "VIDIOC_S_INPUT: could not address saa7111a #1.\n");
+       if (saa7111a_call(mxb, video, s_routing, i, SAA7111_FMT_CCIR, 0))
+               printk(KERN_ERR "VIDIOC_S_INPUT: could not address saa7111a.\n");
 
        /* switch the audio-source only if necessary */
        if (0 == mxb->cur_mute)