Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
linuxdvb: fix possible bug with multi-frontend adapters
  • Loading branch information
adamsutton committed Jan 22, 2015
1 parent 519ec96 commit f88f2f3
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/input/mpegts/linuxdvb/linuxdvb_adapter.c
Expand Up @@ -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)
Expand Down Expand Up @@ -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) */
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit f88f2f3

Please sign in to comment.