diff options
author | Andrew de Quincey <adq_dvb@lidskialf.net> | 2006-08-08 08:10:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-09-26 10:53:29 -0400 |
commit | f52a838b74be70b4054ab27e435e9acb92d8c50a (patch) | |
tree | 81b9b3dff85a069781244636c0a4cf29f0220d86 /drivers/media/dvb/ttpci/budget.c | |
parent | 2a514dea5fda67958c79f5137d4dcb272f8561e8 (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.c')
-rw-r--r-- | drivers/media/dvb/ttpci/budget.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c index 19beb11f9664..e846b9620170 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/dvb/ttpci/budget.c | |||
@@ -442,9 +442,7 @@ static void frontend_init(struct budget *budget) | |||
442 | 442 | ||
443 | error_out: | 443 | error_out: |
444 | printk("budget: Frontend registration failed!\n"); | 444 | printk("budget: Frontend registration failed!\n"); |
445 | dvb_detach(budget->dvb_frontend->ops.release_sec, budget->dvb_frontend); | 445 | dvb_frontend_detach(budget->dvb_frontend); |
446 | dvb_detach(budget->dvb_frontend->ops.tuner_ops.release, budget->dvb_frontend); | ||
447 | dvb_detach(budget->dvb_frontend->ops.release, budget->dvb_frontend); | ||
448 | budget->dvb_frontend = NULL; | 446 | budget->dvb_frontend = NULL; |
449 | return; | 447 | return; |
450 | } | 448 | } |
@@ -484,9 +482,7 @@ static int budget_detach (struct saa7146_dev* dev) | |||
484 | 482 | ||
485 | if (budget->dvb_frontend) { | 483 | if (budget->dvb_frontend) { |
486 | dvb_unregister_frontend(budget->dvb_frontend); | 484 | dvb_unregister_frontend(budget->dvb_frontend); |
487 | dvb_detach(budget->dvb_frontend->ops.release_sec, budget->dvb_frontend); | 485 | dvb_frontend_detach(budget->dvb_frontend); |
488 | dvb_detach(budget->dvb_frontend->ops.tuner_ops.release, budget->dvb_frontend); | ||
489 | dvb_detach(budget->dvb_frontend->ops.release, budget->dvb_frontend); | ||
490 | } | 486 | } |
491 | 487 | ||
492 | err = ttpci_budget_deinit (budget); | 488 | err = ttpci_budget_deinit (budget); |