diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 5dfd826d734e..cc7f3d6ee966 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -1282,7 +1282,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1282 | case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS: | 1282 | case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS: |
1283 | if (configure_tda827x_fe(dev, &tda827x_lifeview_config, | 1283 | if (configure_tda827x_fe(dev, &tda827x_lifeview_config, |
1284 | &tda827x_cfg_0) < 0) | 1284 | &tda827x_cfg_0) < 0) |
1285 | goto dettach_frontend; | 1285 | goto detach_frontend; |
1286 | break; | 1286 | break; |
1287 | case SAA7134_BOARD_PHILIPS_EUROPA: | 1287 | case SAA7134_BOARD_PHILIPS_EUROPA: |
1288 | case SAA7134_BOARD_VIDEOMATE_DVBT_300: | 1288 | case SAA7134_BOARD_VIDEOMATE_DVBT_300: |
@@ -1322,7 +1322,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1322 | case SAA7134_BOARD_KWORLD_DVBT_210: | 1322 | case SAA7134_BOARD_KWORLD_DVBT_210: |
1323 | if (configure_tda827x_fe(dev, &kworld_dvb_t_210_config, | 1323 | if (configure_tda827x_fe(dev, &kworld_dvb_t_210_config, |
1324 | &tda827x_cfg_2) < 0) | 1324 | &tda827x_cfg_2) < 0) |
1325 | goto dettach_frontend; | 1325 | goto detach_frontend; |
1326 | break; | 1326 | break; |
1327 | case SAA7134_BOARD_HAUPPAUGE_HVR1120: | 1327 | case SAA7134_BOARD_HAUPPAUGE_HVR1120: |
1328 | fe0->dvb.frontend = dvb_attach(tda10048_attach, | 1328 | fe0->dvb.frontend = dvb_attach(tda10048_attach, |
@@ -1340,17 +1340,17 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1340 | case SAA7134_BOARD_PHILIPS_TIGER: | 1340 | case SAA7134_BOARD_PHILIPS_TIGER: |
1341 | if (configure_tda827x_fe(dev, &philips_tiger_config, | 1341 | if (configure_tda827x_fe(dev, &philips_tiger_config, |
1342 | &tda827x_cfg_0) < 0) | 1342 | &tda827x_cfg_0) < 0) |
1343 | goto dettach_frontend; | 1343 | goto detach_frontend; |
1344 | break; | 1344 | break; |
1345 | case SAA7134_BOARD_PINNACLE_PCTV_310i: | 1345 | case SAA7134_BOARD_PINNACLE_PCTV_310i: |
1346 | if (configure_tda827x_fe(dev, &pinnacle_pctv_310i_config, | 1346 | if (configure_tda827x_fe(dev, &pinnacle_pctv_310i_config, |
1347 | &tda827x_cfg_1) < 0) | 1347 | &tda827x_cfg_1) < 0) |
1348 | goto dettach_frontend; | 1348 | goto detach_frontend; |
1349 | break; | 1349 | break; |
1350 | case SAA7134_BOARD_HAUPPAUGE_HVR1110: | 1350 | case SAA7134_BOARD_HAUPPAUGE_HVR1110: |
1351 | if (configure_tda827x_fe(dev, &hauppauge_hvr_1110_config, | 1351 | if (configure_tda827x_fe(dev, &hauppauge_hvr_1110_config, |
1352 | &tda827x_cfg_1) < 0) | 1352 | &tda827x_cfg_1) < 0) |
1353 | goto dettach_frontend; | 1353 | goto detach_frontend; |
1354 | break; | 1354 | break; |
1355 | case SAA7134_BOARD_HAUPPAUGE_HVR1150: | 1355 | case SAA7134_BOARD_HAUPPAUGE_HVR1150: |
1356 | fe0->dvb.frontend = dvb_attach(lgdt3305_attach, | 1356 | fe0->dvb.frontend = dvb_attach(lgdt3305_attach, |
@@ -1368,30 +1368,30 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1368 | case SAA7134_BOARD_ASUSTeK_P7131_DUAL: | 1368 | case SAA7134_BOARD_ASUSTeK_P7131_DUAL: |
1369 | if (configure_tda827x_fe(dev, &asus_p7131_dual_config, | 1369 | if (configure_tda827x_fe(dev, &asus_p7131_dual_config, |
1370 | &tda827x_cfg_0) < 0) | 1370 | &tda827x_cfg_0) < 0) |
1371 | goto dettach_frontend; | 1371 | goto detach_frontend; |
1372 | break; | 1372 | break; |
1373 | case SAA7134_BOARD_FLYDVBT_LR301: | 1373 | case SAA7134_BOARD_FLYDVBT_LR301: |
1374 | if (configure_tda827x_fe(dev, &tda827x_lifeview_config, | 1374 | if (configure_tda827x_fe(dev, &tda827x_lifeview_config, |
1375 | &tda827x_cfg_0) < 0) | 1375 | &tda827x_cfg_0) < 0) |
1376 | goto dettach_frontend; | 1376 | goto detach_frontend; |
1377 | break; | 1377 | break; |
1378 | case SAA7134_BOARD_FLYDVB_TRIO: | 1378 | case SAA7134_BOARD_FLYDVB_TRIO: |
1379 | if (!use_frontend) { /* terrestrial */ | 1379 | if (!use_frontend) { /* terrestrial */ |
1380 | if (configure_tda827x_fe(dev, &lifeview_trio_config, | 1380 | if (configure_tda827x_fe(dev, &lifeview_trio_config, |
1381 | &tda827x_cfg_0) < 0) | 1381 | &tda827x_cfg_0) < 0) |
1382 | goto dettach_frontend; | 1382 | goto detach_frontend; |
1383 | } else { /* satellite */ | 1383 | } else { /* satellite */ |
1384 | fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap); | 1384 | fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, &dev->i2c_adap); |
1385 | if (fe0->dvb.frontend) { | 1385 | if (fe0->dvb.frontend) { |
1386 | if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x63, | 1386 | if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x63, |
1387 | &dev->i2c_adap, 0) == NULL) { | 1387 | &dev->i2c_adap, 0) == NULL) { |
1388 | wprintk("%s: Lifeview Trio, No tda826x found!\n", __func__); | 1388 | wprintk("%s: Lifeview Trio, No tda826x found!\n", __func__); |
1389 | goto dettach_frontend; | 1389 | goto detach_frontend; |
1390 | } | 1390 | } |
1391 | if (dvb_attach(isl6421_attach, fe0->dvb.frontend, &dev->i2c_adap, | 1391 | if (dvb_attach(isl6421_attach, fe0->dvb.frontend, &dev->i2c_adap, |
1392 | 0x08, 0, 0) == NULL) { | 1392 | 0x08, 0, 0) == NULL) { |
1393 | wprintk("%s: Lifeview Trio, No ISL6421 found!\n", __func__); | 1393 | wprintk("%s: Lifeview Trio, No ISL6421 found!\n", __func__); |
1394 | goto dettach_frontend; | 1394 | goto detach_frontend; |
1395 | } | 1395 | } |
1396 | } | 1396 | } |
1397 | } | 1397 | } |
@@ -1407,7 +1407,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1407 | &ads_duo_cfg) == NULL) { | 1407 | &ads_duo_cfg) == NULL) { |
1408 | wprintk("no tda827x tuner found at addr: %02x\n", | 1408 | wprintk("no tda827x tuner found at addr: %02x\n", |
1409 | ads_tech_duo_config.tuner_address); | 1409 | ads_tech_duo_config.tuner_address); |
1410 | goto dettach_frontend; | 1410 | goto detach_frontend; |
1411 | } | 1411 | } |
1412 | } else | 1412 | } else |
1413 | wprintk("failed to attach tda10046\n"); | 1413 | wprintk("failed to attach tda10046\n"); |
@@ -1415,13 +1415,13 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1415 | case SAA7134_BOARD_TEVION_DVBT_220RF: | 1415 | case SAA7134_BOARD_TEVION_DVBT_220RF: |
1416 | if (configure_tda827x_fe(dev, &tevion_dvbt220rf_config, | 1416 | if (configure_tda827x_fe(dev, &tevion_dvbt220rf_config, |
1417 | &tda827x_cfg_0) < 0) | 1417 | &tda827x_cfg_0) < 0) |
1418 | goto dettach_frontend; | 1418 | goto detach_frontend; |
1419 | break; | 1419 | break; |
1420 | case SAA7134_BOARD_MEDION_MD8800_QUADRO: | 1420 | case SAA7134_BOARD_MEDION_MD8800_QUADRO: |
1421 | if (!use_frontend) { /* terrestrial */ | 1421 | if (!use_frontend) { /* terrestrial */ |
1422 | if (configure_tda827x_fe(dev, &md8800_dvbt_config, | 1422 | if (configure_tda827x_fe(dev, &md8800_dvbt_config, |
1423 | &tda827x_cfg_0) < 0) | 1423 | &tda827x_cfg_0) < 0) |
1424 | goto dettach_frontend; | 1424 | goto detach_frontend; |
1425 | } else { /* satellite */ | 1425 | } else { /* satellite */ |
1426 | fe0->dvb.frontend = dvb_attach(tda10086_attach, | 1426 | fe0->dvb.frontend = dvb_attach(tda10086_attach, |
1427 | &flydvbs, &dev->i2c_adap); | 1427 | &flydvbs, &dev->i2c_adap); |
@@ -1435,7 +1435,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1435 | 0x60, &dev->i2c_adap, 0) == NULL) { | 1435 | 0x60, &dev->i2c_adap, 0) == NULL) { |
1436 | wprintk("%s: Medion Quadro, no tda826x " | 1436 | wprintk("%s: Medion Quadro, no tda826x " |
1437 | "found !\n", __func__); | 1437 | "found !\n", __func__); |
1438 | goto dettach_frontend; | 1438 | goto detach_frontend; |
1439 | } | 1439 | } |
1440 | if (dev_id != 0x08) { | 1440 | if (dev_id != 0x08) { |
1441 | /* we need to open the i2c gate (we know it exists) */ | 1441 | /* we need to open the i2c gate (we know it exists) */ |
@@ -1444,7 +1444,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1444 | &dev->i2c_adap, 0x08, 0, 0) == NULL) { | 1444 | &dev->i2c_adap, 0x08, 0, 0) == NULL) { |
1445 | wprintk("%s: Medion Quadro, no ISL6405 " | 1445 | wprintk("%s: Medion Quadro, no ISL6405 " |
1446 | "found !\n", __func__); | 1446 | "found !\n", __func__); |
1447 | goto dettach_frontend; | 1447 | goto detach_frontend; |
1448 | } | 1448 | } |
1449 | if (dev_id == 0x07) { | 1449 | if (dev_id == 0x07) { |
1450 | /* fire up the 2nd section of the LNB supply since | 1450 | /* fire up the 2nd section of the LNB supply since |
@@ -1503,12 +1503,12 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1503 | if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x60, | 1503 | if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x60, |
1504 | &dev->i2c_adap, 0) == NULL) { | 1504 | &dev->i2c_adap, 0) == NULL) { |
1505 | wprintk("%s: No tda826x found!\n", __func__); | 1505 | wprintk("%s: No tda826x found!\n", __func__); |
1506 | goto dettach_frontend; | 1506 | goto detach_frontend; |
1507 | } | 1507 | } |
1508 | if (dvb_attach(isl6421_attach, fe0->dvb.frontend, | 1508 | if (dvb_attach(isl6421_attach, fe0->dvb.frontend, |
1509 | &dev->i2c_adap, 0x08, 0, 0) == NULL) { | 1509 | &dev->i2c_adap, 0x08, 0, 0) == NULL) { |
1510 | wprintk("%s: No ISL6421 found!\n", __func__); | 1510 | wprintk("%s: No ISL6421 found!\n", __func__); |
1511 | goto dettach_frontend; | 1511 | goto detach_frontend; |
1512 | } | 1512 | } |
1513 | } | 1513 | } |
1514 | break; | 1514 | break; |
@@ -1537,37 +1537,37 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1537 | case SAA7134_BOARD_CINERGY_HT_PCMCIA: | 1537 | case SAA7134_BOARD_CINERGY_HT_PCMCIA: |
1538 | if (configure_tda827x_fe(dev, &cinergy_ht_config, | 1538 | if (configure_tda827x_fe(dev, &cinergy_ht_config, |
1539 | &tda827x_cfg_0) < 0) | 1539 | &tda827x_cfg_0) < 0) |
1540 | goto dettach_frontend; | 1540 | goto detach_frontend; |
1541 | break; | 1541 | break; |
1542 | case SAA7134_BOARD_CINERGY_HT_PCI: | 1542 | case SAA7134_BOARD_CINERGY_HT_PCI: |
1543 | if (configure_tda827x_fe(dev, &cinergy_ht_pci_config, | 1543 | if (configure_tda827x_fe(dev, &cinergy_ht_pci_config, |
1544 | &tda827x_cfg_0) < 0) | 1544 | &tda827x_cfg_0) < 0) |
1545 | goto dettach_frontend; | 1545 | goto detach_frontend; |
1546 | break; | 1546 | break; |
1547 | case SAA7134_BOARD_PHILIPS_TIGER_S: | 1547 | case SAA7134_BOARD_PHILIPS_TIGER_S: |
1548 | if (configure_tda827x_fe(dev, &philips_tiger_s_config, | 1548 | if (configure_tda827x_fe(dev, &philips_tiger_s_config, |
1549 | &tda827x_cfg_2) < 0) | 1549 | &tda827x_cfg_2) < 0) |
1550 | goto dettach_frontend; | 1550 | goto detach_frontend; |
1551 | break; | 1551 | break; |
1552 | case SAA7134_BOARD_ASUS_P7131_4871: | 1552 | case SAA7134_BOARD_ASUS_P7131_4871: |
1553 | if (configure_tda827x_fe(dev, &asus_p7131_4871_config, | 1553 | if (configure_tda827x_fe(dev, &asus_p7131_4871_config, |
1554 | &tda827x_cfg_2) < 0) | 1554 | &tda827x_cfg_2) < 0) |
1555 | goto dettach_frontend; | 1555 | goto detach_frontend; |
1556 | break; | 1556 | break; |
1557 | case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA: | 1557 | case SAA7134_BOARD_ASUSTeK_P7131_HYBRID_LNA: |
1558 | if (configure_tda827x_fe(dev, &asus_p7131_hybrid_lna_config, | 1558 | if (configure_tda827x_fe(dev, &asus_p7131_hybrid_lna_config, |
1559 | &tda827x_cfg_2) < 0) | 1559 | &tda827x_cfg_2) < 0) |
1560 | goto dettach_frontend; | 1560 | goto detach_frontend; |
1561 | break; | 1561 | break; |
1562 | case SAA7134_BOARD_AVERMEDIA_SUPER_007: | 1562 | case SAA7134_BOARD_AVERMEDIA_SUPER_007: |
1563 | if (configure_tda827x_fe(dev, &avermedia_super_007_config, | 1563 | if (configure_tda827x_fe(dev, &avermedia_super_007_config, |
1564 | &tda827x_cfg_0) < 0) | 1564 | &tda827x_cfg_0) < 0) |
1565 | goto dettach_frontend; | 1565 | goto detach_frontend; |
1566 | break; | 1566 | break; |
1567 | case SAA7134_BOARD_TWINHAN_DTV_DVB_3056: | 1567 | case SAA7134_BOARD_TWINHAN_DTV_DVB_3056: |
1568 | if (configure_tda827x_fe(dev, &twinhan_dtv_dvb_3056_config, | 1568 | if (configure_tda827x_fe(dev, &twinhan_dtv_dvb_3056_config, |
1569 | &tda827x_cfg_2_sw42) < 0) | 1569 | &tda827x_cfg_2_sw42) < 0) |
1570 | goto dettach_frontend; | 1570 | goto detach_frontend; |
1571 | break; | 1571 | break; |
1572 | case SAA7134_BOARD_PHILIPS_SNAKE: | 1572 | case SAA7134_BOARD_PHILIPS_SNAKE: |
1573 | fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, | 1573 | fe0->dvb.frontend = dvb_attach(tda10086_attach, &flydvbs, |
@@ -1576,24 +1576,24 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1576 | if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x60, | 1576 | if (dvb_attach(tda826x_attach, fe0->dvb.frontend, 0x60, |
1577 | &dev->i2c_adap, 0) == NULL) { | 1577 | &dev->i2c_adap, 0) == NULL) { |
1578 | wprintk("%s: No tda826x found!\n", __func__); | 1578 | wprintk("%s: No tda826x found!\n", __func__); |
1579 | goto dettach_frontend; | 1579 | goto detach_frontend; |
1580 | } | 1580 | } |
1581 | if (dvb_attach(lnbp21_attach, fe0->dvb.frontend, | 1581 | if (dvb_attach(lnbp21_attach, fe0->dvb.frontend, |
1582 | &dev->i2c_adap, 0, 0) == NULL) { | 1582 | &dev->i2c_adap, 0, 0) == NULL) { |
1583 | wprintk("%s: No lnbp21 found!\n", __func__); | 1583 | wprintk("%s: No lnbp21 found!\n", __func__); |
1584 | goto dettach_frontend; | 1584 | goto detach_frontend; |
1585 | } | 1585 | } |
1586 | } | 1586 | } |
1587 | break; | 1587 | break; |
1588 | case SAA7134_BOARD_CREATIX_CTX953: | 1588 | case SAA7134_BOARD_CREATIX_CTX953: |
1589 | if (configure_tda827x_fe(dev, &md8800_dvbt_config, | 1589 | if (configure_tda827x_fe(dev, &md8800_dvbt_config, |
1590 | &tda827x_cfg_0) < 0) | 1590 | &tda827x_cfg_0) < 0) |
1591 | goto dettach_frontend; | 1591 | goto detach_frontend; |
1592 | break; | 1592 | break; |
1593 | case SAA7134_BOARD_MSI_TVANYWHERE_AD11: | 1593 | case SAA7134_BOARD_MSI_TVANYWHERE_AD11: |
1594 | if (configure_tda827x_fe(dev, &philips_tiger_s_config, | 1594 | if (configure_tda827x_fe(dev, &philips_tiger_s_config, |
1595 | &tda827x_cfg_2) < 0) | 1595 | &tda827x_cfg_2) < 0) |
1596 | goto dettach_frontend; | 1596 | goto detach_frontend; |
1597 | break; | 1597 | break; |
1598 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: | 1598 | case SAA7134_BOARD_AVERMEDIA_CARDBUS_506: |
1599 | dprintk("AverMedia E506R dvb setup\n"); | 1599 | dprintk("AverMedia E506R dvb setup\n"); |
@@ -1614,7 +1614,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1614 | &dev->i2c_adap, DVB_PLL_PHILIPS_SD1878_TDA8261) == NULL) { | 1614 | &dev->i2c_adap, DVB_PLL_PHILIPS_SD1878_TDA8261) == NULL) { |
1615 | wprintk("%s: MD7134 DVB-S, no SD1878 " | 1615 | wprintk("%s: MD7134 DVB-S, no SD1878 " |
1616 | "found !\n", __func__); | 1616 | "found !\n", __func__); |
1617 | goto dettach_frontend; | 1617 | goto detach_frontend; |
1618 | } | 1618 | } |
1619 | /* we need to open the i2c gate (we know it exists) */ | 1619 | /* we need to open the i2c gate (we know it exists) */ |
1620 | fe = fe0->dvb.frontend; | 1620 | fe = fe0->dvb.frontend; |
@@ -1623,7 +1623,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1623 | &dev->i2c_adap, 0x08, 0, 0) == NULL) { | 1623 | &dev->i2c_adap, 0x08, 0, 0) == NULL) { |
1624 | wprintk("%s: MD7134 DVB-S, no ISL6405 " | 1624 | wprintk("%s: MD7134 DVB-S, no ISL6405 " |
1625 | "found !\n", __func__); | 1625 | "found !\n", __func__); |
1626 | goto dettach_frontend; | 1626 | goto detach_frontend; |
1627 | } | 1627 | } |
1628 | fe->ops.i2c_gate_ctrl(fe, 0); | 1628 | fe->ops.i2c_gate_ctrl(fe, 0); |
1629 | dev->original_set_voltage = fe->ops.set_voltage; | 1629 | dev->original_set_voltage = fe->ops.set_voltage; |
@@ -1645,7 +1645,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1645 | if (!use_frontend) { /* terrestrial */ | 1645 | if (!use_frontend) { /* terrestrial */ |
1646 | if (configure_tda827x_fe(dev, &asus_tiger_3in1_config, | 1646 | if (configure_tda827x_fe(dev, &asus_tiger_3in1_config, |
1647 | &tda827x_cfg_2) < 0) | 1647 | &tda827x_cfg_2) < 0) |
1648 | goto dettach_frontend; | 1648 | goto detach_frontend; |
1649 | } else { /* satellite */ | 1649 | } else { /* satellite */ |
1650 | fe0->dvb.frontend = dvb_attach(tda10086_attach, | 1650 | fe0->dvb.frontend = dvb_attach(tda10086_attach, |
1651 | &flydvbs, &dev->i2c_adap); | 1651 | &flydvbs, &dev->i2c_adap); |
@@ -1655,13 +1655,13 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1655 | &dev->i2c_adap, 0) == NULL) { | 1655 | &dev->i2c_adap, 0) == NULL) { |
1656 | wprintk("%s: Asus Tiger 3in1, no " | 1656 | wprintk("%s: Asus Tiger 3in1, no " |
1657 | "tda826x found!\n", __func__); | 1657 | "tda826x found!\n", __func__); |
1658 | goto dettach_frontend; | 1658 | goto detach_frontend; |
1659 | } | 1659 | } |
1660 | if (dvb_attach(lnbp21_attach, fe0->dvb.frontend, | 1660 | if (dvb_attach(lnbp21_attach, fe0->dvb.frontend, |
1661 | &dev->i2c_adap, 0, 0) == NULL) { | 1661 | &dev->i2c_adap, 0, 0) == NULL) { |
1662 | wprintk("%s: Asus Tiger 3in1, no lnbp21" | 1662 | wprintk("%s: Asus Tiger 3in1, no lnbp21" |
1663 | " found!\n", __func__); | 1663 | " found!\n", __func__); |
1664 | goto dettach_frontend; | 1664 | goto detach_frontend; |
1665 | } | 1665 | } |
1666 | } | 1666 | } |
1667 | } | 1667 | } |
@@ -1670,7 +1670,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1670 | if (!use_frontend) { /* terrestrial */ | 1670 | if (!use_frontend) { /* terrestrial */ |
1671 | if (configure_tda827x_fe(dev, &asus_ps3_100_config, | 1671 | if (configure_tda827x_fe(dev, &asus_ps3_100_config, |
1672 | &tda827x_cfg_2) < 0) | 1672 | &tda827x_cfg_2) < 0) |
1673 | goto dettach_frontend; | 1673 | goto detach_frontend; |
1674 | } else { /* satellite */ | 1674 | } else { /* satellite */ |
1675 | fe0->dvb.frontend = dvb_attach(tda10086_attach, | 1675 | fe0->dvb.frontend = dvb_attach(tda10086_attach, |
1676 | &flydvbs, &dev->i2c_adap); | 1676 | &flydvbs, &dev->i2c_adap); |
@@ -1680,13 +1680,13 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1680 | &dev->i2c_adap, 0) == NULL) { | 1680 | &dev->i2c_adap, 0) == NULL) { |
1681 | wprintk("%s: Asus My Cinema PS3-100, no " | 1681 | wprintk("%s: Asus My Cinema PS3-100, no " |
1682 | "tda826x found!\n", __func__); | 1682 | "tda826x found!\n", __func__); |
1683 | goto dettach_frontend; | 1683 | goto detach_frontend; |
1684 | } | 1684 | } |
1685 | if (dvb_attach(lnbp21_attach, fe0->dvb.frontend, | 1685 | if (dvb_attach(lnbp21_attach, fe0->dvb.frontend, |
1686 | &dev->i2c_adap, 0, 0) == NULL) { | 1686 | &dev->i2c_adap, 0, 0) == NULL) { |
1687 | wprintk("%s: Asus My Cinema PS3-100, no lnbp21" | 1687 | wprintk("%s: Asus My Cinema PS3-100, no lnbp21" |
1688 | " found!\n", __func__); | 1688 | " found!\n", __func__); |
1689 | goto dettach_frontend; | 1689 | goto detach_frontend; |
1690 | } | 1690 | } |
1691 | } | 1691 | } |
1692 | } | 1692 | } |
@@ -1694,7 +1694,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1694 | case SAA7134_BOARD_ASUSTeK_TIGER: | 1694 | case SAA7134_BOARD_ASUSTeK_TIGER: |
1695 | if (configure_tda827x_fe(dev, &philips_tiger_config, | 1695 | if (configure_tda827x_fe(dev, &philips_tiger_config, |
1696 | &tda827x_cfg_0) < 0) | 1696 | &tda827x_cfg_0) < 0) |
1697 | goto dettach_frontend; | 1697 | goto detach_frontend; |
1698 | break; | 1698 | break; |
1699 | case SAA7134_BOARD_BEHOLD_H6: | 1699 | case SAA7134_BOARD_BEHOLD_H6: |
1700 | fe0->dvb.frontend = dvb_attach(zl10353_attach, | 1700 | fe0->dvb.frontend = dvb_attach(zl10353_attach, |
@@ -1830,19 +1830,19 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1830 | }; | 1830 | }; |
1831 | 1831 | ||
1832 | if (!fe0->dvb.frontend) | 1832 | if (!fe0->dvb.frontend) |
1833 | goto dettach_frontend; | 1833 | goto detach_frontend; |
1834 | 1834 | ||
1835 | fe = dvb_attach(xc2028_attach, fe0->dvb.frontend, &cfg); | 1835 | fe = dvb_attach(xc2028_attach, fe0->dvb.frontend, &cfg); |
1836 | if (!fe) { | 1836 | if (!fe) { |
1837 | printk(KERN_ERR "%s/2: xc3028 attach failed\n", | 1837 | printk(KERN_ERR "%s/2: xc3028 attach failed\n", |
1838 | dev->name); | 1838 | dev->name); |
1839 | goto dettach_frontend; | 1839 | goto detach_frontend; |
1840 | } | 1840 | } |
1841 | } | 1841 | } |
1842 | 1842 | ||
1843 | if (NULL == fe0->dvb.frontend) { | 1843 | if (NULL == fe0->dvb.frontend) { |
1844 | printk(KERN_ERR "%s/dvb: frontend initialization failed\n", dev->name); | 1844 | printk(KERN_ERR "%s/dvb: frontend initialization failed\n", dev->name); |
1845 | goto dettach_frontend; | 1845 | goto detach_frontend; |
1846 | } | 1846 | } |
1847 | /* define general-purpose callback pointer */ | 1847 | /* define general-purpose callback pointer */ |
1848 | fe0->dvb.frontend->callback = saa7134_tuner_callback; | 1848 | fe0->dvb.frontend->callback = saa7134_tuner_callback; |
@@ -1864,7 +1864,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1864 | } | 1864 | } |
1865 | return ret; | 1865 | return ret; |
1866 | 1866 | ||
1867 | dettach_frontend: | 1867 | detach_frontend: |
1868 | videobuf_dvb_dealloc_frontends(&dev->frontends); | 1868 | videobuf_dvb_dealloc_frontends(&dev->frontends); |
1869 | return -EINVAL; | 1869 | return -EINVAL; |
1870 | } | 1870 | } |