Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 366748
b: refs/heads/master
c: da9f07f
h: refs/heads/master
v: v3
  • Loading branch information
Frank Schaefer authored and Mauro Carvalho Chehab committed Mar 23, 2013
1 parent c43f729 commit 7d99ca3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b1a301572a10d1daf69247c73fcd50f6e378654a
refs/heads/master: da9f07f2d4dae676992b7f5d3e1377beea0d7644
4 changes: 3 additions & 1 deletion trunk/drivers/media/pci/bt8xx/bttv-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 7d99ca3

Please sign in to comment.