Skip to content

Commit

Permalink
[media] bttv: apply mute settings on open
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Frank Schaefer authored and Mauro Carvalho Chehab committed Mar 23, 2013
1 parent da9f07f commit 0757f5c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/media/pci/bt8xx/bttv-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 0757f5c

Please sign in to comment.