summaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-05 10:12:35 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 09:36:47 -0200
commitb46a9c8b7a8a77f28773816fd2afa1186743457d (patch)
tree58714629b18d50f5c49b448f657fbabdda5f2e9f /drivers/media/video
parent8f2b7b70600212f8c809a7bc2d17d33561842440 (diff)
downloadlinux-stable-b46a9c8b7a8a77f28773816fd2afa1186743457d.tar.gz
linux-stable-b46a9c8b7a8a77f28773816fd2afa1186743457d.tar.bz2
linux-stable-b46a9c8b7a8a77f28773816fd2afa1186743457d.zip
V4L/DVB (8627): Fix mute on bttv driver
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index c3526d0258f8..035a58d1aaa4 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -3275,6 +3275,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++;
@@ -3336,6 +3337,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;
}