diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-19 13:22:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-19 13:22:25 -0300 |
| commit | 598f0b510d71f54ec76132c98557f923f493acd7 (patch) | |
| tree | 1ff85b653cd654b34af187d2047e98506ede95f2 /linux | |
| parent | f057f1086d5a06fdd0eb40748636b3d951ba1b98 (diff) | |
| download | mediapointer-dvb-s2-598f0b510d71f54ec76132c98557f923f493acd7.tar.gz mediapointer-dvb-s2-598f0b510d71f54ec76132c98557f923f493acd7.tar.bz2 | |
cx88: Fix: Loads tuner module before sending commands to it
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
linux/drivers/media/video/cx88/cx88-cards.c | 5 +++++
linux/drivers/media/video/cx88/cx88-video.c | 2 --
2 files changed, 5 insertions(+), 2 deletions(-)
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 561659d4f..932b796e5 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -2584,6 +2584,11 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr) cx88_reset(core); cx88_card_setup_pre_i2c(core); cx88_i2c_init(core, pci); + + /* load tuner module, if needed */ + if (TUNER_ABSENT != core->board.tuner_type) + request_module("tuner"); + cx88_call_i2c_clients (core, TUNER_SET_STANDBY, NULL); cx88_card_setup(core); cx88_ir_init(core, pci); diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index 903fa28f6..df9e2e8e2 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -2119,8 +2119,6 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev, cx_set(MO_PCI_INTMSK, core->pci_irqmask); /* load and configure helper modules */ - if (TUNER_ABSENT != core->board.tuner_type) - request_module("tuner"); if (core->board.audio_chip == AUDIO_CHIP_WM8775) request_module("wm8775"); |