From: Mauro Carvalho Chehab Date: Tue, 19 Feb 2008 19:26:33 +0000 (-0300) Subject: V4L/DVB (7268): saa7134: fix: tuner should be loaded before calling saa7134_board_init2() X-Git-Tag: MMI-PSA29.97-13-9~35920^2~8 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c030f5e697af1127002a0aeffcd259f9bcff5471;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 --- diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 52baa4f7f7dd..58ab163fdbd7 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"); }