OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] dvbdev: add a dvb_detach() macro 

The dvb_attach() was unbalanced, as there was no dvb_dettach. Ok,
on current cases, the dettach is done by dvbdev, but that are some
future corner cases where we may need to do this before registering
the frontend.

So, add a dvb_detach() and use it at dvb_frontend.c.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2014-05-29 09:20:13 -03:00
parent 3a370222b0
commit 4647f48708
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/dvb-core/dvb_frontend.c
View File

@ -2666,20 +2666,20 @@ void dvb_frontend_detach(struct dvb_frontend* fe)
if (fe->ops.release_sec) { if (fe->ops.release_sec) {
fe->ops.release_sec(fe); fe->ops.release_sec(fe);
symbol_put_addr(fe->ops.release_sec); dvb_detach(fe->ops.release_sec);
} }
if (fe->ops.tuner_ops.release) { if (fe->ops.tuner_ops.release) {
fe->ops.tuner_ops.release(fe); 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) { if (fe->ops.analog_ops.release) {
fe->ops.analog_ops.release(fe); 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; ptr = (void*)fe->ops.release;
if (ptr) { if (ptr) {
fe->ops.release(fe); fe->ops.release(fe);
symbol_put_addr(ptr); dvb_detach(ptr);
} }
} }
#else #else

4
drivers/media/dvb-core/dvbdev.h
View File

@ -136,11 +136,15 @@ extern int dvb_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
__r; \ __r; \
}) })
#define dvb_detach(FUNC) symbol_put_addr(FUNC)
#else #else
#define dvb_attach(FUNCTION, ARGS...) ({ \ #define dvb_attach(FUNCTION, ARGS...) ({ \
FUNCTION(ARGS); \ FUNCTION(ARGS); \
}) })
#define dvb_detach(FUNC) {}
#endif #endif
#endif /* #ifndef _DVBDEV_H_ */ #endif /* #ifndef _DVBDEV_H_ */