diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 11:00:22 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-06-03 11:00:22 -0300 |
| commit | aec12fb2da90fde6ec9056cec90f9a65a8b02305 (patch) | |
| tree | 165e7fde6514536d9e2f4f4bafd21be43ddca55e /linux/drivers/media/video/bt8xx/bttv-driver.c | |
| parent | 57666826019dd00470e7838c4edf8e558f0b56dd (diff) | |
| parent | 78d3abf60e2a313a3ae4173b47d58a9e79c6d58e (diff) | |
| download | mediapointer-dvb-s2-aec12fb2da90fde6ec9056cec90f9a65a8b02305.tar.gz mediapointer-dvb-s2-aec12fb2da90fde6ec9056cec90f9a65a8b02305.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-driver.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index bb9ad09f8..86aa590b3 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -3311,6 +3311,7 @@ static int bttv_open(struct inode *inode, struct file *file) sizeof(struct bttv_buffer), fh); set_tvnorm(btv,btv->tvnorm); + set_input(btv, btv->input, btv->tvnorm); btv->users++; @@ -3371,6 +3372,10 @@ static int bttv_release(struct inode *inode, struct file *file) btv->users--; bttv_field_count(btv); + + if (!btv->users) + audio_mute(btv, 1); + return 0; } |