From 82aab400b8b901a0fd22932f933dd709810a0c3f Mon Sep 17 00:00:00 2001 From: Gerd Knorr Date: Fri, 23 Apr 2004 15:44:33 +0000 Subject: - cx88: minor audio fixes. --- linux/drivers/media/video/cx88/cx88-video.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 48a35015c..6dd251531 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -503,22 +503,23 @@ static int set_tvaudio(struct cx8800_dev *dev) } else if (V4L2_STD_SECAM_DK & dev->tvnorm->id) { dev->tvaudio = WW_A2_DK; - } else if (V4L2_STD_NTSC_M & dev->tvnorm->id) { + } else if ((V4L2_STD_NTSC_M & dev->tvnorm->id) || + (V4L2_STD_PAL_M & dev->tvnorm->id)) { dev->tvaudio = WW_BTSC; } else if (V4L2_STD_NTSC_M_JP & dev->tvnorm->id) { dev->tvaudio = WW_EIAJ; } else { - dprintk(1,"tvaudio support needs work for this tv norm [%s], sorry\n", - dev->tvnorm->name); + printk("%s: tvaudio support needs work for this tv norm [%s], sorry\n", + dev->name, dev->tvnorm->name); dev->tvaudio = 0; return 0; } cx_andor(MO_AFECFG_IO, 0x1f, 0x0); cx88_set_tvaudio(dev); - cx88_set_stereo(dev,V4L2_TUNER_MODE_STEREO); + // cx88_set_stereo(dev,V4L2_TUNER_MODE_STEREO); cx_write(MO_AUDD_LNGTH, 128/8); /* fifo size */ cx_write(MO_AUDR_LNGTH, 128/8); /* fifo size */ -- cgit v1.2.3