stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

linuxdvb: fix possible bug with multi-frontend adapters

Browse source
This commit is contained in:
Adam Sutton 2015-01-22 15:12:09 +00:00
parent 519ec9677e
commit f88f2f33ff
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/input/mpegts/linuxdvb/linuxdvb_adapter.c
View file

@ -193,7 +193,7 @@ linuxdvb_adapter_add ( const char *path )
struct dvb_frontend_info dfi;
SHA_CTX sha1;
uint8_t uuidbin[20];
htsmsg_t *conf, *feconf;
htsmsg_t *conf = NULL, *feconf = NULL;
int save = 0;
dvb_fe_type_t type;
#if DVB_VER_ATLEAST(5,5)
@ -222,8 +222,6 @@ linuxdvb_adapter_add ( const char *path )
/* Process each frontend */
for (i = 0; i < 32; i++) {
conf = feconf = NULL;
snprintf(fe_path, sizeof(fe_path), FE_PATH, path, i);
/* Wait for access (first FE can take a fe ms to be setup) */
@ -340,9 +338,12 @@ linuxdvb_adapter_add ( const char *path )
}
#endif
pthread_mutex_unlock(&global_lock);
htsmsg_destroy(conf);
}
/* Cleanup */
if (conf)
htsmsg_destroy(conf);
/* Relock before exit */
pthread_mutex_lock(&global_lock);