From 7d99ca39741a16b389fc2970a89f87342190a898 Mon Sep 17 00:00:00 2001 From: Frank Schaefer Date: Thu, 21 Mar 2013 13:51:19 -0300 Subject: [PATCH] --- yaml --- r: 366748 b: refs/heads/master c: da9f07f2d4dae676992b7f5d3e1377beea0d7644 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/bt8xx/bttv-driver.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 67875e062acf..d4d98e3c2feb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1a301572a10d1daf69247c73fcd50f6e378654a +refs/heads/master: da9f07f2d4dae676992b7f5d3e1377beea0d7644 diff --git a/trunk/drivers/media/pci/bt8xx/bttv-driver.c b/trunk/drivers/media/pci/bt8xx/bttv-driver.c index 0df4a167585d..55eab61bed63 100644 --- a/trunk/drivers/media/pci/bt8xx/bttv-driver.c +++ b/trunk/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,