diff options
Diffstat (limited to 'drivers/media/dvb/bt8xx/dvb-bt8xx.c')
-rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.c | 8 |
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) | |||
706 | else | 706 | else |
707 | if (dvb_register_frontend(&card->dvb_adapter, card->fe)) { | 707 | if (dvb_register_frontend(&card->dvb_adapter, card->fe)) { |
708 | printk("dvb-bt8xx: Frontend registration failed!\n"); | 708 | printk("dvb-bt8xx: Frontend registration failed!\n"); |
709 | dvb_detach(card->fe->ops.release_sec, card->fe); | 709 | dvb_frontend_detach(card->fe); |
710 | dvb_detach(card->fe->ops.tuner_ops.release, card->fe); | ||
711 | dvb_detach(card->fe->ops.release, card->fe); | ||
712 | card->fe = NULL; | 710 | card->fe = NULL; |
713 | } | 711 | } |
714 | } | 712 | } |
@@ -927,9 +925,7 @@ static void dvb_bt8xx_remove(struct bttv_sub_device *sub) | |||
927 | dvb_dmx_release(&card->demux); | 925 | dvb_dmx_release(&card->demux); |
928 | if (card->fe) { | 926 | if (card->fe) { |
929 | dvb_unregister_frontend(card->fe); | 927 | dvb_unregister_frontend(card->fe); |
930 | dvb_detach(card->fe->ops.release_sec, card->fe); | 928 | dvb_frontend_detach(card->fe); |
931 | dvb_detach(card->fe->ops.tuner_ops.release, card->fe); | ||
932 | dvb_detach(card->fe->ops.release, card->fe); | ||
933 | } | 929 | } |
934 | dvb_unregister_adapter(&card->dvb_adapter); | 930 | dvb_unregister_adapter(&card->dvb_adapter); |
935 | 931 | ||