Commit 0757f5c5 authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab

[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: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent da9f07f2
...@@ -3065,7 +3065,7 @@ static int bttv_open(struct file *file) ...@@ -3065,7 +3065,7 @@ static int bttv_open(struct file *file)
fh, &btv->lock); fh, &btv->lock);
set_tvnorm(btv,btv->tvnorm); set_tvnorm(btv,btv->tvnorm);
set_input(btv, btv->input, btv->tvnorm); set_input(btv, btv->input, btv->tvnorm);
audio_mute(btv, btv->mute);
/* The V4L2 spec requires one global set of cropping parameters /* The V4L2 spec requires one global set of cropping parameters
which only change on request. These are stored in btv->crop[1]. which only change on request. These are stored in btv->crop[1].
...@@ -3230,6 +3230,7 @@ static int radio_open(struct file *file) ...@@ -3230,6 +3230,7 @@ static int radio_open(struct file *file)
v4l2_fh_init(&fh->fh, vdev); v4l2_fh_init(&fh->fh, vdev);
btv->radio_user++; btv->radio_user++;
audio_mute(btv, btv->mute);
v4l2_fh_add(&fh->fh); v4l2_fh_add(&fh->fh);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment