V4L/DVB (4931): Removed usbvision_ioctl.h, since it isn't required anymore

[safe/jmp/linux-2.6] / drivers / media / video / video-buf-dvb.c

diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 376d354..fcc5467 100644 (file)
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -20,7 +20,7 @@
 #include <linux/fs.h>
 #include <linux/kthread.h>
 #include <linux/file.h>
-#include <linux/suspend.h>
+#include <linux/freezer.h>
 
 #include <media/video-buf.h>
 #include <media/video-buf-dvb.h>
@@ -223,9 +223,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);
        dvb_unregister_adapter(&dvb->adapter);
 fail_adapter:
        return result;
@@ -239,9 +237,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);
        dvb_unregister_adapter(&dvb->adapter);
 }