summaryrefslogtreecommitdiff
path: root/drivers/media/pci/bt8xx
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2013-03-21 13:51:20 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-23 11:33:01 -0300
commit0757f5c503a8b2eebc67c6bb8e3b88077d73049a (patch)
treeeb3aab2887494876b0591f9963af63570a6c47b0 /drivers/media/pci/bt8xx
parentda9f07f2d4dae676992b7f5d3e1377beea0d7644 (diff)
[media] bttv: apply mute settings on open
Previously, this has been done implicitly for video device nodes by calling set_input() (which calls audio_input() and also modified the mute setting). Since input and mute setting are now untangled (as much as possible), we need to apply the mute setting with an explicit call to audio_mute(). Also apply the mute setting when the radio device node gets opened. Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/bt8xx')
-rw-r--r--drivers/media/pci/bt8xx/bttv-driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 55eab61bed63..2fb2168f74e2 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -3065,7 +3065,7 @@ static int bttv_open(struct file *file)
fh, &btv->lock);
set_tvnorm(btv,btv->tvnorm);
set_input(btv, btv->input, btv->tvnorm);
-
+ audio_mute(btv, btv->mute);
/* The V4L2 spec requires one global set of cropping parameters
which only change on request. These are stored in btv->crop[1].
@@ -3230,6 +3230,7 @@ static int radio_open(struct file *file)
v4l2_fh_init(&fh->fh, vdev);
btv->radio_user++;
+ audio_mute(btv, btv->mute);
v4l2_fh_add(&fh->fh);