diff options
author | Darron Broad <darron@kewl.org> | 2008-10-11 16:18:53 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-17 22:23:15 +0200 |
commit | 92abe9ee374599179033f039b095864a9cf74593 (patch) | |
tree | 2e4304cac9052a8848b972e678d372bd49d7db29 /drivers/media/video/saa7134/saa7134-dvb.c | |
parent | V4L/DVB (9222): S2API: Add Multiple-frontend on a single adapter support. (diff) | |
download | linux-92abe9ee374599179033f039b095864a9cf74593.tar.xz linux-92abe9ee374599179033f039b095864a9cf74593.zip |
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.c | 7 |
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, { struct videobuf_dvb_frontend *fe0; - fe0 = videobuf_dvb_get_frontend(&dev->frontends, 0); + /* Get the first frontend */ + fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1); fe0->dvb.frontend = dvb_attach(tda10046_attach, cdec_conf, &dev->i2c_adap); if (fe0->dvb.frontend) { @@ -951,7 +952,7 @@ static int dvb_init(struct saa7134_dev *dev) struct videobuf_dvb_frontend *fe0; /* Get the first frontend */ - fe0 = videobuf_dvb_get_frontend(&dev->frontends, 0); + fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1); if (!fe0) return -EINVAL; @@ -1070,7 +1071,7 @@ static int dvb_init(struct saa7134_dev *dev) &tda827x_cfg_0) < 0) goto dettach_frontend; break; - case SAA7134_BOARD_FLYDVB_TRIO: // XXXXXX multifrontend + case SAA7134_BOARD_FLYDVB_TRIO: if (!use_frontend) { /* terrestrial */ if (configure_tda827x_fe(dev, &lifeview_trio_config, &tda827x_cfg_0) < 0) |