aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/budget-patch.c
diff options
context:
space:
mode:
authorAndrew de Quincey <adq_dvb@lidskialf.net>2006-08-08 08:10:09 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-09-26 10:53:29 -0400
commitf52a838b74be70b4054ab27e435e9acb92d8c50a (patch)
tree81b9b3dff85a069781244636c0a4cf29f0220d86 /drivers/media/dvb/ttpci/budget-patch.c
parent2a514dea5fda67958c79f5137d4dcb272f8561e8 (diff)
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/ttpci/budget-patch.c')
-rw-r--r--drivers/media/dvb/ttpci/budget-patch.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 82dbef863e51..d043e1f50d92 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -367,9 +367,7 @@ static void frontend_init(struct budget_patch* budget)
367 } else { 367 } else {
368 if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) { 368 if (dvb_register_frontend(&budget->dvb_adapter, budget->dvb_frontend)) {
369 printk("budget-av: Frontend registration failed!\n"); 369 printk("budget-av: Frontend registration failed!\n");
370 dvb_detach(budget->dvb_frontend->ops.release_sec, budget->dvb_frontend); 370 dvb_frontend_detach(budget->dvb_frontend);
371 dvb_detach(budget->dvb_frontend->ops.tuner_ops.release, budget->dvb_frontend);
372 dvb_detach(budget->dvb_frontend->ops.release, budget->dvb_frontend);
373 budget->dvb_frontend = NULL; 371 budget->dvb_frontend = NULL;
374 } 372 }
375 } 373 }
@@ -630,9 +628,7 @@ static int budget_patch_detach (struct saa7146_dev* dev)
630 628
631 if (budget->dvb_frontend) { 629 if (budget->dvb_frontend) {
632 dvb_unregister_frontend(budget->dvb_frontend); 630 dvb_unregister_frontend(budget->dvb_frontend);
633 dvb_detach(budget->dvb_frontend->ops.release_sec, budget->dvb_frontend); 631 dvb_frontend_detach(budget->dvb_frontend);
634 dvb_detach(budget->dvb_frontend->ops.tuner_ops.release, budget->dvb_frontend);
635 dvb_detach(budget->dvb_frontend->ops.release, budget->dvb_frontend);
636 } 632 }
637 err = ttpci_budget_deinit (budget); 633 err = ttpci_budget_deinit (budget);
638 634