diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-07 18:47:47 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-07 18:47:47 -0600 |
| commit | 00629ac158e1be3124b796078cf0347b946cb053 (patch) | |
| tree | bcd75715575579ba26f6b96cd66627fdba3bf02d /drivers/media/pci/bt8xx/bttv-driver.c | |
| parent | 2bf8ea63c7bb43b2b79ae3faa0797f1d83c6820c (diff) | |
| parent | 095f493c4d532b0ced3aee22e2d5b2cea02aa773 (diff) | |
Merge tag 'v3.10.25' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.25-finallinux-lng-3.10.25-2014.01
This is the 3.10.25 stable release
Conflicts:
kernel/futex.c
Diffstat (limited to 'drivers/media/pci/bt8xx/bttv-driver.c')
| -rw-r--r-- | drivers/media/pci/bt8xx/bttv-driver.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index e7d088413411..e2633d9270b7 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -4226,7 +4226,8 @@ 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 (!bttv_tvcards[btv->c.type].no_video) + v4l2_ctrl_handler_setup(hdl); if (hdl->error) { result = hdl->error; goto fail2; |