aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/bt8xx
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-08-08 09:10:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 11:53:29 -0300
commitf52a838b74be70b4054ab27e435e9acb92d8c50a (patch)
tree81b9b3dff85a069781244636c0a4cf29f0220d86 /drivers/media/dvb/bt8xx
parentV4L/DVB (4389): Remove duplication _release() op. (diff)
downloadlinux-dev-f52a838b74be70b4054ab27e435e9acb92d8c50a.tar.xz
linux-dev-f52a838b74be70b4054ab27e435e9acb92d8c50a.zip
V4L/DVB (4391): Refactor dvb_detach calls into a single dvb_frontend_detach function.
Remove buggy dvb_detach() macro and replace with unified dvb_frontend_detach() call. Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net> Acked-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/bt8xx')
-rw-r--r--drivers/media/dvb/bt8xx/dvb-bt8xx.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 6f0bb7360991..db1eba9a5c36 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -706,9 +706,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
else
if (dvb_register_frontend(&card->dvb_adapter, card->fe)) {
printk("dvb-bt8xx: Frontend registration failed!\n");
- dvb_detach(card->fe->ops.release_sec, card->fe);
- dvb_detach(card->fe->ops.tuner_ops.release, card->fe);
- dvb_detach(card->fe->ops.release, card->fe);
+ dvb_frontend_detach(card->fe);
card->fe = NULL;
}
}
@@ -927,9 +925,7 @@ static void dvb_bt8xx_remove(struct bttv_sub_device *sub)
dvb_dmx_release(&card->demux);
if (card->fe) {
dvb_unregister_frontend(card->fe);
- dvb_detach(card->fe->ops.release_sec, card->fe);
- dvb_detach(card->fe->ops.tuner_ops.release, card->fe);
- dvb_detach(card->fe->ops.release, card->fe);
+ dvb_frontend_detach(card->fe);
}
dvb_unregister_adapter(&card->dvb_adapter);