diff options
author | Darron Broad <darron@kewl.org> | 2008-10-11 10:18:53 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-17 16:23:15 -0400 |
commit | 92abe9ee374599179033f039b095864a9cf74593 (patch) | |
tree | 2e4304cac9052a8848b972e678d372bd49d7db29 /drivers/media/video/videobuf-dvb.c | |
parent | 363c35fc448943c3d6121332d28bcda2d2fbf87c (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/videobuf-dvb.c')
-rw-r--r-- | drivers/media/video/videobuf-dvb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c index 194fb765e58b..a0a80e1e79e3 100644 --- a/drivers/media/video/videobuf-dvb.c +++ b/drivers/media/video/videobuf-dvb.c | |||
@@ -229,7 +229,6 @@ int videobuf_dvb_register_frontend(struct dvb_adapter *adapter, struct videobuf_ | |||
229 | dvb->dmxdev.filternum = 256; | 229 | dvb->dmxdev.filternum = 256; |
230 | dvb->dmxdev.demux = &dvb->demux.dmx; | 230 | dvb->dmxdev.demux = &dvb->demux.dmx; |
231 | dvb->dmxdev.capabilities = 0; | 231 | dvb->dmxdev.capabilities = 0; |
232 | //result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter); | ||
233 | result = dvb_dmxdev_init(&dvb->dmxdev, adapter); | 232 | result = dvb_dmxdev_init(&dvb->dmxdev, adapter); |
234 | 233 | ||
235 | if (result < 0) { | 234 | if (result < 0) { |
@@ -277,7 +276,7 @@ fail_dmx: | |||
277 | dvb_unregister_frontend(dvb->frontend); | 276 | dvb_unregister_frontend(dvb->frontend); |
278 | fail_frontend: | 277 | fail_frontend: |
279 | dvb_frontend_detach(dvb->frontend); | 278 | dvb_frontend_detach(dvb->frontend); |
280 | dvb_unregister_adapter(&dvb->adapter); | 279 | dvb_unregister_adapter(adapter); |
281 | 280 | ||
282 | return result; | 281 | return result; |
283 | } | 282 | } |