diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-19 13:26:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-19 13:26:33 -0300 |
| commit | a22e381267d978380786062e1d061d9424ccf08a (patch) | |
| tree | 6268011479dcc4c4c4e38c210c29a5774901d041 /linux/drivers/media/video | |
| parent | 598f0b510d71f54ec76132c98557f923f493acd7 (diff) | |
| download | mediapointer-dvb-s2-a22e381267d978380786062e1d061d9424ccf08a.tar.gz mediapointer-dvb-s2-a22e381267d978380786062e1d061d9424ccf08a.tar.bz2 | |
saa7134: fix: tuner should be loaded before calling saa7134_board_init2()
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 2a7d414ef..20c67b190 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1085,12 +1085,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"); } |