diff options
author | darron@kewl.org <darron@kewl.org> | 2008-10-11 15:18:53 +0100 |
---|---|---|
committer | darron@kewl.org <darron@kewl.org> | 2008-10-11 15:18:53 +0100 |
commit | 270e299bd7d5775be3af60217fb512a480a75a33 (patch) | |
tree | 7111d6cd69127b10b37cff1dcb7e02f6fa251b0d /linux/drivers/media/video/cx23885 | |
parent | fcfcc128910473bdf3411a074894ae36c808106a (diff) | |
download | mediapointer-dvb-s2-270e299bd7d5775be3af60217fb512a480a75a33.tar.gz mediapointer-dvb-s2-270e299bd7d5775be3af60217fb512a480a75a33.tar.bz2 |
MFE: Fix a number of bugs and some tidying up
From: Darron Broad <darron@kewl.org>
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.
Priority: normal
Signed-off-by: Darron Broad <darron@kewl.org>
Diffstat (limited to 'linux/drivers/media/video/cx23885')
-rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-dvb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-dvb.c b/linux/drivers/media/video/cx23885/cx23885-dvb.c index e53afbcbd..bf570c70e 100644 --- a/linux/drivers/media/video/cx23885/cx23885-dvb.c +++ b/linux/drivers/media/video/cx23885/cx23885-dvb.c @@ -315,7 +315,7 @@ static int dvb_register(struct cx23885_tsport *port) 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; @@ -337,7 +337,7 @@ static int dvb_register(struct cx23885_tsport *port) 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, @@ -555,7 +555,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port) 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; @@ -584,7 +584,7 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port) { 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); |