| Message ID | 1363807490-3906-8-git-send-email-fschaefer.oss@googlemail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed 20 March 2013 20:24:47 Frank Schäfer wrote: Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Regards, Hans > Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> > --- > drivers/media/pci/bt8xx/bttv-driver.c | 4 +++- > 1 Datei geändert, 3 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) > > diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c > index 0df4a16..55eab61 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, > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 0df4a16..55eab61 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,
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> --- drivers/media/pci/bt8xx/bttv-driver.c | 4 +++- 1 Datei geändert, 3 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)