summaryrefslogtreecommitdiff
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2013-03-21 20:51:19 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-23 18:32:48 +0400
commitda9f07f2d4dae676992b7f5d3e1377beea0d7644 (patch)
treeeb762a4e5768bf19fa8f25345a2b7d8231cf6010 /drivers/media/pci
parentb1a301572a10d1daf69247c73fcd50f6e378654a (diff)
downloadlinux-da9f07f2d4dae676992b7f5d3e1377beea0d7644.tar.xz
[media] bttv: do not unmute the device before the first open
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')
-rw-r--r--drivers/media/pci/bt8xx/bttv-driver.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 0df4a167585d..55eab61bed63 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -4212,11 +4212,13 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
btv->std = V4L2_STD_PAL;
init_irqreg(btv);
v4l2_ctrl_handler_setup(hdl);
-
if (hdl->error) {
result = hdl->error;
goto fail2;
}
+ /* mute device */
+ audio_mute(btv, 1);
+
/* register video4linux + input */
if (!bttv_tvcards[btv->c.type].no_video) {
v4l2_ctrl_add_handler(&btv->radio_ctrl_handler, hdl,