summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-07-28 23:10:41 +0100
committerAndrew de Quincey <adq_dvb@lidskialf.net>2006-07-28 23:10:41 +0100
commit401232ba8026e33a71183d3c80a83b53b3ef6ee4 (patch)
tree597575847989714d163281f4cdab33ad36ad42c3 /linux/drivers/media/video
parent9fdfcc1df7ba94e30044857638249b0194003335 (diff)
downloadmediapointer-dvb-s2-401232ba8026e33a71183d3c80a83b53b3ef6ee4.tar.gz
mediapointer-dvb-s2-401232ba8026e33a71183d3c80a83b53b3ef6ee4.tar.bz2
Refactor dvb_detach calls into a single dvb_frontend_detach function.
From: Andrew de Quincey <adq_dvb@lidskialf.net> Remove buggy dvb_detach() macro and replace with unified dvb_frontend_detach() call. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Acked-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/video-buf-dvb.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c
index 499302844..b5e472c4d 100644
--- a/linux/drivers/media/video/video-buf-dvb.c
+++ b/linux/drivers/media/video/video-buf-dvb.c
@@ -246,9 +246,7 @@ fail_dmxdev:
fail_dmx:
dvb_unregister_frontend(dvb->frontend);
fail_frontend:
- dvb_detach(dvb->frontend->ops.release_sec, dvb->frontend);
- dvb_detach(dvb->frontend->ops.tuner_ops.release, dvb->frontend);
- dvb_detach(dvb->frontend->ops.release, dvb->frontend);
+ dvb_frontend_detach(dvb->frontend);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
dvb_unregister_adapter(&dvb->adapter);
#else
@@ -266,9 +264,7 @@ void videobuf_dvb_unregister(struct videobuf_dvb *dvb)
dvb_dmxdev_release(&dvb->dmxdev);
dvb_dmx_release(&dvb->demux);
dvb_unregister_frontend(dvb->frontend);
- dvb_detach(dvb->frontend->ops.release_sec, dvb->frontend);
- dvb_detach(dvb->frontend->ops.tuner_ops.release, dvb->frontend);
- dvb_detach(dvb->frontend->ops.release, dvb->frontend);
+ dvb_frontend_detach(dvb->frontend);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12))
dvb_unregister_adapter(&dvb->adapter);
#else