]> err.no Git - linux-2.6/commitdiff
V4L/DVB (5776): Hardware MPEG audio fix for SAA7134 based "KNC One TV-Station DVR...
authorRafael Bilski <rafalbilski@interia.pl>
Wed, 20 Jun 2007 08:37:27 +0000 (05:37 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 18 Jul 2007 17:24:14 +0000 (14:24 -0300)
With previous patch card is generating MPEG audio stream too.
Unfortunatly I2S audio output is muted. Unmute it.

Signed-off-by: Rafal Bilski <rafalbilski@interia.pl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/saa7134/saa7134-empress.c

index f521603482cab0ed249995eb740889ef2c2fa4ff..fc260ec8fdc2b940af785559b3cac06f73cd2258 100644 (file)
@@ -96,6 +96,10 @@ static int ts_open(struct inode *inode, struct file *file)
        if (dev->empress_users)
                goto done_up;
 
+       /* Unmute audio */
+       saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
+               saa_readb(SAA7134_AUDIO_MUTE_CTRL) & ~(1 << 6));
+
        dev->empress_users++;
        file->private_data = dev;
        err = 0;
@@ -121,6 +125,10 @@ static int ts_release(struct inode *inode, struct file *file)
        /* stop the encoder */
        ts_reset_encoder(dev);
 
+       /* Mute audio */
+       saa_writeb(SAA7134_AUDIO_MUTE_CTRL,
+               saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6));
+
        mutex_unlock(&dev->empress_tsq.lock);
        return 0;
 }