diff options
Diffstat (limited to 'drivers/media/video/mxb.c')
-rw-r--r-- | drivers/media/video/mxb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index 823f126b89cc..9f01f14e4aa2 100644 --- a/drivers/media/video/mxb.c +++ b/drivers/media/video/mxb.c | |||
@@ -298,7 +298,7 @@ static int mxb_init_done(struct saa7146_dev* dev) | |||
298 | /* select tuner-output on saa7111a */ | 298 | /* select tuner-output on saa7111a */ |
299 | i = 0; | 299 | i = 0; |
300 | saa7111a_call(mxb, video, s_routing, SAA7115_COMPOSITE0, | 300 | saa7111a_call(mxb, video, s_routing, SAA7115_COMPOSITE0, |
301 | SAA7111_FMT_CCIR | SAA7111_VBI_BYPASS, 0); | 301 | SAA7111_FMT_CCIR, 0); |
302 | 302 | ||
303 | /* select a tuner type */ | 303 | /* select a tuner type */ |
304 | tun_setup.mode_mask = T_ANALOG_TV; | 304 | tun_setup.mode_mask = T_ANALOG_TV; |
@@ -522,8 +522,8 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input) | |||
522 | return err; | 522 | return err; |
523 | 523 | ||
524 | /* switch video in saa7111a */ | 524 | /* switch video in saa7111a */ |
525 | if (saa7111a_call(mxb, video, s_routing, i, 0, 0)) | 525 | if (saa7111a_call(mxb, video, s_routing, i, SAA7111_FMT_CCIR, 0)) |
526 | printk(KERN_ERR "VIDIOC_S_INPUT: could not address saa7111a #1.\n"); | 526 | printk(KERN_ERR "VIDIOC_S_INPUT: could not address saa7111a.\n"); |
527 | 527 | ||
528 | /* switch the audio-source only if necessary */ | 528 | /* switch the audio-source only if necessary */ |
529 | if (0 == mxb->cur_mute) | 529 | if (0 == mxb->cur_mute) |