From daac414c61d45e0196bfca3c950ba310724b06cf Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 19 Feb 2008 16:26:33 -0300 Subject: [PATCH] --- yaml --- r: 87536 b: refs/heads/master c: c030f5e697af1127002a0aeffcd259f9bcff5471 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-core.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 00d9e1e4e496..45231943b171 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 189bf5f05093ff71cec3e2a16d199a85ba035a43 +refs/heads/master: c030f5e697af1127002a0aeffcd259f9bcff5471 diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c index 52baa4f7f7dd..58ab163fdbd7 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-core.c +++ b/trunk/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"); }