diff options
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-tvaudio.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-tvaudio.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c index 3540d76b5..25c3da74c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-tvaudio.c,v 1.10 2004/09/15 16:15:24 kraxel Exp $ + * $Id: saa7134-tvaudio.c,v 1.11 2004/09/16 15:38:41 kraxel Exp $ * * device driver for philips saa7134 based TV cards * tv audio decoder (fm stereo, nicam, ...) @@ -795,7 +795,10 @@ static int tvaudio_thread_ddep(void *data) /* insmod option override */ norms = (audio_ddep << 2) | 0x01; dprintk("ddep override: %s\n",stdres[audio_ddep]); - } else{ + } else if (&card(dev).radio == dev->input) { + dprintk("FM Radio\n"); + norms = (0x0f << 2) | 0x01; + } else { /* (let chip) scan for sound carrier */ norms = 0; if (dev->tvnorm->id & V4L2_STD_PAL) { @@ -827,7 +830,7 @@ static int tvaudio_thread_ddep(void *data) /* setup crossbars */ saa_dsp_writel(dev, 0x464 >> 2, 0x000000); saa_dsp_writel(dev, 0x470 >> 2, 0x101010); - + if (tvaudio_sleep(dev,3*HZ)) goto restart; value = saa_readl(0x528 >> 2) & 0xffffff; |