]> Pileus Git - ~andy/linux/commitdiff
[media] bttv: do not unmute the device before the first open
authorFrank Schaefer <fschaefer.oss@googlemail.com>
Thu, 21 Mar 2013 16:51:19 +0000 (13:51 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 23 Mar 2013 14:32:48 +0000 (11:32 -0300)
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>
drivers/media/pci/bt8xx/bttv-driver.c

index 0df4a167585d4b6ad941687b36515de91e081501..55eab61bed63126dfdbcddd46fa7a7ff1ae9fb93 100644 (file)
@@ -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,