diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-19 16:26:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-20 12:38:58 -0300 |
| commit | c030f5e697af1127002a0aeffcd259f9bcff5471 (patch) | |
| tree | 8d2ddeb272727983f581a32268bafb70eaf0bccd /drivers/media | |
| parent | 189bf5f05093ff71cec3e2a16d199a85ba035a43 (diff) | |
| download | op-kernel-dev-c030f5e697af1127002a0aeffcd259f9bcff5471.zip op-kernel-dev-c030f5e697af1127002a0aeffcd259f9bcff5471.tar.gz | |
V4L/DVB (7268): saa7134: fix: tuner should be loaded before calling saa7134_board_init2()
There are several parts of saa7134_board_init2() that calls tuner modules. We
should first load tuner, otherwise, the commands will fail.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 52baa4f..58ab163 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c @@ -1022,12 +1022,13 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, saa7134_i2c_register(dev); /* initialize hardware #2 */ + if (TUNER_ABSENT != dev->tuner_type) + request_module("tuner"); saa7134_board_init2(dev); + saa7134_hwinit2(dev); /* load i2c helpers */ - if (TUNER_ABSENT != dev->tuner_type) - request_module("tuner"); if (card_is_empress(dev)) { request_module("saa6752hs"); } |
