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>
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index fe1218f..d8c25a8 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -314,7 +314,7 @@
struct cx23885_i2c *i2c_bus = NULL;
struct videobuf_dvb_frontend *fe0;
- fe0 = videobuf_dvb_get_frontend(&port->frontends, 0);
+ fe0 = videobuf_dvb_get_frontend(&port->frontends, 1);
if (!fe0)
return -EINVAL;
@@ -336,7 +336,7 @@
break;
case CX23885_BOARD_HAUPPAUGE_HVR1800:
i2c_bus = &dev->i2c_bus[0];
- switch (alt_tuner) { // XXXXXX multifrontend?
+ switch (alt_tuner) {
case 1:
fe0->dvb.frontend =
dvb_attach(s5h1409_attach,
@@ -554,7 +554,7 @@
struct cx23885_dev *dev = port->dev;
int err;
- fe0 = videobuf_dvb_get_frontend(&port->frontends, 0);
+ fe0 = videobuf_dvb_get_frontend(&port->frontends, 1);
if (!fe0)
err = -EINVAL;
@@ -583,7 +583,7 @@
{
struct videobuf_dvb_frontend *fe0;
- fe0 = videobuf_dvb_get_frontend(&port->frontends, 0);
+ fe0 = videobuf_dvb_get_frontend(&port->frontends, 1);
/* dvb */
if(fe0->dvb.frontend)
videobuf_dvb_unregister_bus(&port->frontends);