aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-dvb.c
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-08-08 14:48:08 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 10:53:40 -0400
commit4ad8eee5ac8d8336ac7965e4a4027a7b4ec080f1 (patch)
tree3ded043f9341c69ac72a761c9213cfd5e5d33cae /drivers/media/video/saa7134/saa7134-dvb.c
parentc162dff6437d5f66c272b1811074ee32c53d17b9 (diff)
V4L/DVB (4438): Fix dvb_pll_attach for nxt2004-based cards
The test in dvb-pll to see if a tuner's PLL responds when attaching fails on NXT2004 based boards before the firmware is loaded. This patch allows us to avoid this test by not passing an I2C bus handle to the dvb_pll_attach routine, just as Chris Pascoe has done for MT352 and ZL10353 based boards when used in cx88-dvb. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-dvb.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index e2d366b8fbef..fc3cae340bec 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1198,13 +1198,15 @@ static int dvb_init(struct saa7134_dev *dev)
1198 case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: 1198 case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
1199 dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180, &dev->i2c_adap); 1199 dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180, &dev->i2c_adap);
1200 if (dev->dvb.frontend) { 1200 if (dev->dvb.frontend) {
1201 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, &dev->i2c_adap, &dvb_pll_tdhu2); 1201 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
1202 NULL, &dvb_pll_tdhu2);
1202 } 1203 }
1203 break; 1204 break;
1204 case SAA7134_BOARD_KWORLD_ATSC110: 1205 case SAA7134_BOARD_KWORLD_ATSC110:
1205 dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110, &dev->i2c_adap); 1206 dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110, &dev->i2c_adap);
1206 if (dev->dvb.frontend) { 1207 if (dev->dvb.frontend) {
1207 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, &dev->i2c_adap, &dvb_pll_tuv1236d); 1208 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
1209 NULL, &dvb_pll_tuv1236d);
1208 } 1210 }
1209 break; 1211 break;
1210 case SAA7134_BOARD_FLYDVBS_LR300: 1212 case SAA7134_BOARD_FLYDVBS_LR300: