aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/video-buf-dvb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/video-buf-dvb.c')
-rw-r--r--drivers/media/video/video-buf-dvb.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 376d354b27f6..f53edf1923b7 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -223,9 +223,7 @@ fail_dmxdev:
223fail_dmx: 223fail_dmx:
224 dvb_unregister_frontend(dvb->frontend); 224 dvb_unregister_frontend(dvb->frontend);
225fail_frontend: 225fail_frontend:
226 dvb_detach(dvb->frontend->ops.release_sec, dvb->frontend); 226 dvb_frontend_detach(dvb->frontend);
227 dvb_detach(dvb->frontend->ops.tuner_ops.release, dvb->frontend);
228 dvb_detach(dvb->frontend->ops.release, dvb->frontend);
229 dvb_unregister_adapter(&dvb->adapter); 227 dvb_unregister_adapter(&dvb->adapter);
230fail_adapter: 228fail_adapter:
231 return result; 229 return result;
@@ -239,9 +237,7 @@ void videobuf_dvb_unregister(struct videobuf_dvb *dvb)
239 dvb_dmxdev_release(&dvb->dmxdev); 237 dvb_dmxdev_release(&dvb->dmxdev);
240 dvb_dmx_release(&dvb->demux); 238 dvb_dmx_release(&dvb->demux);
241 dvb_unregister_frontend(dvb->frontend); 239 dvb_unregister_frontend(dvb->frontend);
242 dvb_detach(dvb->frontend->ops.release_sec, dvb->frontend); 240 dvb_frontend_detach(dvb->frontend);
243 dvb_detach(dvb->frontend->ops.tuner_ops.release, dvb->frontend);
244 dvb_detach(dvb->frontend->ops.release, dvb->frontend);
245 dvb_unregister_adapter(&dvb->adapter); 241 dvb_unregister_adapter(&dvb->adapter);
246} 242}
247 243