From 87f6f582157e25ff0a32b7aca9364acd483ce771 Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Wed, 19 Dec 2012 20:46:35 +0000 Subject: [PATCH] Issue #1403 - ensure adapter config is properly loaded. --- src/dvb/dvb_adapter.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/dvb/dvb_adapter.c b/src/dvb/dvb_adapter.c index ca8729e2..21b9cab6 100644 --- a/src/dvb/dvb_adapter.c +++ b/src/dvb/dvb_adapter.c @@ -482,10 +482,7 @@ tda_add(int adapter_num) free(tda); return; } - if (tda->tda_idlescan || !tda->tda_idleclose) - tda->tda_fe_fd = fe; - else - close(fe); + tda->tda_fe_fd = fe; tda->tda_type = tda->tda_fe_info->type; @@ -709,6 +706,10 @@ dvb_adapter_init(uint32_t adapter_mask, const char *rawfile) TAILQ_FOREACH(tda, &dvb_adapters, tda_global_link) { tda_init_input(tda); + if (tda->tda_idlescan || !tda->tda_idleclose) { + close(tda->tda_fe_fd); + tda->tda_fe_fd = -1; + } if(tda->tda_sat) dvb_satconf_init(tda);