diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-19 16:22:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-20 12:38:57 -0300 |
| commit | 189bf5f05093ff71cec3e2a16d199a85ba035a43 (patch) | |
| tree | b611024ebe003daab7092672c388028f4b219a82 | |
| parent | 2db2da913fb7d10a0281cd856135ef19fc2e67a8 (diff) | |
| download | kernel-crypto-189bf5f05093ff71cec3e2a16d199a85ba035a43.tar.gz kernel-crypto-189bf5f05093ff71cec3e2a16d199a85ba035a43.tar.xz kernel-crypto-189bf5f05093ff71cec3e2a16d199a85ba035a43.zip | |
V4L/DVB (7267): cx88: Fix: Loads tuner module before sending commands to it
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/cx88/cx88-cards.c | 5 | ||||
| -rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index e6b7f518c56..8c9a8adf52d 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c @@ -2196,6 +2196,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/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 7f1931aed20..227179620d1 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c @@ -1826,8 +1826,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"); |