diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2005-07-12 16:58:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-12 19:01:06 -0400 |
commit | 85369df350b138f26eac779da33de0960635ca4d (patch) | |
tree | 5a3fecc16fd22d840a102d5c14e0a725bf12e4be /drivers | |
parent | 1455050f04084161c8a9425008e3b9b5f5c4c2a3 (diff) |
[PATCH] v4l: MXB fix to correct tuner ioctl
- driver command adapted to use new control (TUNER_SET_TYPE_ADDR,
instead of TUNER_SET_TYPE)
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/video/mxb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c index 70bf1f1fad59..486234d41b56 100644 --- a/drivers/media/video/mxb.c +++ b/drivers/media/video/mxb.c | |||
@@ -326,6 +326,7 @@ static int mxb_init_done(struct saa7146_dev* dev) | |||
326 | struct mxb* mxb = (struct mxb*)dev->ext_priv; | 326 | struct mxb* mxb = (struct mxb*)dev->ext_priv; |
327 | struct video_decoder_init init; | 327 | struct video_decoder_init init; |
328 | struct i2c_msg msg; | 328 | struct i2c_msg msg; |
329 | struct tuner_setup tun_setup; | ||
329 | 330 | ||
330 | int i = 0, err = 0; | 331 | int i = 0, err = 0; |
331 | struct tea6415c_multiplex vm; | 332 | struct tea6415c_multiplex vm; |
@@ -349,8 +350,10 @@ static int mxb_init_done(struct saa7146_dev* dev) | |||
349 | mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_VBI_BYPASS, &i); | 350 | mxb->saa7111a->driver->command(mxb->saa7111a,DECODER_SET_VBI_BYPASS, &i); |
350 | 351 | ||
351 | /* select a tuner type */ | 352 | /* select a tuner type */ |
352 | i = 5; | 353 | tun_setup.mode_mask = T_ANALOG_TV; |
353 | mxb->tuner->driver->command(mxb->tuner,TUNER_SET_TYPE, &i); | 354 | tun_setup.addr = ADDR_UNSET; |
355 | tun_setup.type = 5; | ||
356 | mxb->tuner->driver->command(mxb->tuner,TUNER_SET_TYPE_ADDR, &tun_setup); | ||
354 | 357 | ||
355 | /* mute audio on tea6420s */ | 358 | /* mute audio on tea6420s */ |
356 | mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[6][0]); | 359 | mxb->tea6420_1->driver->command(mxb->tea6420_1,TEA6420_SWITCH, &TEA6420_line[6][0]); |