Signed-off-by: Frank Schäfer <[email protected]>
---
 drivers/media/pci/bt8xx/bttv-driver.c |    8 +++++---
 1 Datei geändert, 5 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c 
b/drivers/media/pci/bt8xx/bttv-driver.c
index 945ecd2..6432bfe 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -3062,8 +3062,7 @@ static int bttv_open(struct file *file)
                            sizeof(struct bttv_buffer),
                            fh, &btv->lock);
        set_tvnorm(btv,btv->tvnorm);
-       set_input(btv, btv->input, btv->tvnorm);
-
+       set_input(btv, btv->input, btv->tvnorm); /* also (un)mutes audio */
 
        /* The V4L2 spec requires one global set of cropping parameters
           which only change on request. These are stored in btv->crop[1].
@@ -4209,11 +4208,14 @@ 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,
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to