diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-10 12:22:05 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-10 12:22:05 -0300 |
| commit | 9c782f8be1617143d1ee0ecdab0c52e2f019bd2e (patch) | |
| tree | d0381c37259cb84d6b231e07ad99b23d296fa722 /linux/drivers/media | |
| parent | b91b73e291565ec104b4f43ad9294fda133cf0f2 (diff) | |
| parent | 1944dbf8ab52a04e7c918d6177e2a76e5fa28469 (diff) | |
| download | mediapointer-dvb-s2-9c782f8be1617143d1ee0ecdab0c52e2f019bd2e.tar.gz mediapointer-dvb-s2-9c782f8be1617143d1ee0ecdab0c52e2f019bd2e.tar.bz2 | |
merge: http://linuxtv.org/hg/~rmcc/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-alsa.c | 8 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-tvaudio.c | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c index d2a1ca7ce..64fba2d36 100644 --- a/linux/drivers/media/video/saa7134/saa7134-alsa.c +++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c @@ -658,6 +658,11 @@ static int snd_card_saa7134_capture_close(snd_pcm_substream_t * substream) static int snd_card_saa7134_capture_close(struct snd_pcm_substream * substream) #endif { + snd_card_saa7134_t *saa7134 = snd_pcm_substream_chip(substream); + struct saa7134_dev *dev = saa7134->dev; + + dev->ctl_mute = 1; + saa7134_tvaudio_setmute(dev); return 0; } @@ -707,6 +712,9 @@ static int snd_card_saa7134_capture_open(struct snd_pcm_substream * substream) runtime->private_free = snd_card_saa7134_runtime_free; runtime->hw = snd_card_saa7134_capture; + dev->ctl_mute = 0; + saa7134_tvaudio_setmute(dev); + if ((err = snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS)) < 0) return err; diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c index f0d037475..af7ded81c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -1098,6 +1098,7 @@ int saa7134_tvaudio_do_scan(struct saa7134_dev *dev) } EXPORT_SYMBOL(saa_dsp_writel); +EXPORT_SYMBOL(saa7134_tvaudio_setmute); /* ----------------------------------------------------------- */ /* |