aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-dvb.c
diff options
context:
space:
mode:
authorDarron Broad <darron@kewl.org>2008-10-11 10:18:53 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-17 16:23:15 -0400
commit92abe9ee374599179033f039b095864a9cf74593 (patch)
tree2e4304cac9052a8848b972e678d372bd49d7db29 /drivers/media/video/saa7134/saa7134-dvb.c
parent363c35fc448943c3d6121332d28bcda2d2fbf87c (diff)
V4L/DVB (9223): MFE: Fix a number of bugs and some tidying up
A number of reference to videobuf_dvb_get_frontend used an invalid index. This has been fixed. The section for the HVR3000 in advise_acquire was redundant as the same logic is used on the HVR4000. This has been removed and both cards now use the same function. A number of small errors and whitespace errors are also fixed. Signed-off-by: Darron Broad <darron@kewl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-dvb.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 8ada0497fa03..cdb5f5dfe4d9 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -537,7 +537,8 @@ static int configure_tda827x_fe(struct saa7134_dev *dev,
537{ 537{
538 struct videobuf_dvb_frontend *fe0; 538 struct videobuf_dvb_frontend *fe0;
539 539
540 fe0 = videobuf_dvb_get_frontend(&dev->frontends, 0); 540 /* Get the first frontend */
541 fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
541 542
542 fe0->dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &dev->i2c_adap); 543 fe0->dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &dev->i2c_adap);
543 if (fe0->dvb.frontend) { 544 if (fe0->dvb.frontend) {
@@ -951,7 +952,7 @@ static int dvb_init(struct saa7134_dev *dev)
951 struct videobuf_dvb_frontend *fe0; 952 struct videobuf_dvb_frontend *fe0;
952 953
953 /* Get the first frontend */ 954 /* Get the first frontend */
954 fe0 = videobuf_dvb_get_frontend(&dev->frontends, 0); 955 fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
955 if (!fe0) 956 if (!fe0)
956 return -EINVAL; 957 return -EINVAL;
957 958
@@ -1070,7 +1071,7 @@ static int dvb_init(struct saa7134_dev *dev)
1070 &tda827x_cfg_0) < 0) 1071 &tda827x_cfg_0) < 0)
1071 goto dettach_frontend; 1072 goto dettach_frontend;
1072 break; 1073 break;
1073 case SAA7134_BOARD_FLYDVB_TRIO: // XXXXXX multifrontend 1074 case SAA7134_BOARD_FLYDVB_TRIO:
1074 if (!use_frontend) { /* terrestrial */ 1075 if (!use_frontend) { /* terrestrial */
1075 if (configure_tda827x_fe(dev, &lifeview_trio_config, 1076 if (configure_tda827x_fe(dev, &lifeview_trio_config,
1076 &tda827x_cfg_0) < 0) 1077 &tda827x_cfg_0) < 0)