summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/bt8xx
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-07-28 23:10:41 +0100
committerAndrew de Quincey <adq_dvb@lidskialf.net>2006-07-28 23:10:41 +0100
commit401232ba8026e33a71183d3c80a83b53b3ef6ee4 (patch)
tree597575847989714d163281f4cdab33ad36ad42c3 /linux/drivers/media/dvb/bt8xx
parent9fdfcc1df7ba94e30044857638249b0194003335 (diff)
downloadmediapointer-dvb-s2-401232ba8026e33a71183d3c80a83b53b3ef6ee4.tar.gz
mediapointer-dvb-s2-401232ba8026e33a71183d3c80a83b53b3ef6ee4.tar.bz2
Refactor dvb_detach calls into a single dvb_frontend_detach function.
From: Andrew de Quincey <adq_dvb@lidskialf.net> 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>
Diffstat (limited to 'linux/drivers/media/dvb/bt8xx')
-rw-r--r--linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index bc0b81896..3031be25d 100644
--- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -707,9 +707,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;
}
}
@@ -947,9 +945,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);