aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2013-03-21 12:51:20 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-23 10:33:01 -0400
commit0757f5c503a8b2eebc67c6bb8e3b88077d73049a (patch)
treeeb3aab2887494876b0591f9963af63570a6c47b0
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>
-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)
3065 fh, &btv->lock); 3065 fh, &btv->lock);
3066 set_tvnorm(btv,btv->tvnorm); 3066 set_tvnorm(btv,btv->tvnorm);
3067 set_input(btv, btv->input, btv->tvnorm); 3067 set_input(btv, btv->input, btv->tvnorm);
3068 3068 audio_mute(btv, btv->mute);
3069 3069
3070 /* The V4L2 spec requires one global set of cropping parameters 3070 /* The V4L2 spec requires one global set of cropping parameters
3071 which only change on request. These are stored in btv->crop[1]. 3071 which only change on request. These are stored in btv->crop[1].
@@ -3230,6 +3230,7 @@ static int radio_open(struct file *file)
3230 v4l2_fh_init(&fh->fh, vdev); 3230 v4l2_fh_init(&fh->fh, vdev);
3231 3231
3232 btv->radio_user++; 3232 btv->radio_user++;
3233 audio_mute(btv, btv->mute);
3233 3234
3234 v4l2_fh_add(&fh->fh); 3235 v4l2_fh_add(&fh->fh);
3235 3236