2 files changed, 8 insertions, 4 deletions

diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 6ce435ac866f..6cc2631d8f0e 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -2666,20 +2666,20 @@ void dvb_frontend_detach(struct dvb_frontend* fe)
 
         if (fe->ops.release_sec) {
                 fe->ops.release_sec(fe);
-                symbol_put_addr(fe->ops.release_sec);
+                dvb_detach(fe->ops.release_sec);
         }
         if (fe->ops.tuner_ops.release) {
                 fe->ops.tuner_ops.release(fe);
-                symbol_put_addr(fe->ops.tuner_ops.release);
+                dvb_detach(fe->ops.tuner_ops.release);
         }
         if (fe->ops.analog_ops.release) {
                 fe->ops.analog_ops.release(fe);
-                symbol_put_addr(fe->ops.analog_ops.release);
+                dvb_detach(fe->ops.analog_ops.release);
         }
         ptr = (void*)fe->ops.release;
         if (ptr) {
                 fe->ops.release(fe);
-                symbol_put_addr(ptr);
+                dvb_detach(ptr);
         }
 }
 #else
diff --git a/drivers/media/dvb-core/dvbdev.h b/drivers/media/dvb-core/dvbdev.h
index 93a9470d3f0c..f96b28e7fc95 100644
--- a/drivers/media/dvb-core/dvbdev.h
+++ b/drivers/media/dvb-core/dvbdev.h
@@ -136,11 +136,15 @@ extern int dvb_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
         __r; \
 })
 
+#define dvb_detach(FUNC)        symbol_put_addr(FUNC)
+
 #else
 #define dvb_attach(FUNCTION, ARGS...) ({ \
         FUNCTION(ARGS); \
 })
 
+#define dvb_detach(FUNC)        {}
+
 #endif
 
 #endif /* #ifndef _DVBDEV_H_ */