]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
descrambler: fix mm_descrambler_lock deadlock in the CAT callback, fixes #2636
authorJaroslav Kysela <perex@perex.cz>
Sat, 24 Jan 2015 19:22:29 +0000 (20:22 +0100)
committerJaroslav Kysela <perex@perex.cz>
Sat, 24 Jan 2015 19:22:29 +0000 (20:22 +0100)
src/descrambler/descrambler.c

index b97c25d4ee7daac4d15fcc6c1f3897ae174c1770..e65848acd33a205496ae714e765d0cb2ffb4e55b 100755 (executable)
@@ -747,7 +747,7 @@ next:
         caid = emm->caid;
         pid  = emm->pid;
         tvhtrace("descrambler", "close emm caid %04X (%i) pid %04X (%i)", caid, caid, pid, pid);
-        descrambler_close_pid(mux, emm->opaque, pid);
+        descrambler_close_pid_(mux, emm->opaque, pid);
       }
       TAILQ_REMOVE(&mux->mm_descrambler_emms, emm, link);
       TAILQ_INSERT_TAIL(&removing, emm, link);