From 401232ba8026e33a71183d3c80a83b53b3ef6ee4 Mon Sep 17 00:00:00 2001 From: Andrew de Quincey Date: Fri, 28 Jul 2006 23:10:41 +0100 Subject: Refactor dvb_detach calls into a single dvb_frontend_detach function. From: Andrew de Quincey Remove buggy dvb_detach() macro and replace with unified dvb_frontend_detach() call. Signed-off-by: Andrew de Quincey Acked-by: Trent Piepho --- linux/drivers/media/video/video-buf-dvb.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'linux/drivers/media/video') 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 -- cgit v1.2.3