From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 24 Jan 2015 19:22:29 +0000 (+0100)
Subject: descrambler: fix mm_descrambler_lock deadlock in the CAT callback, fixes #2636
X-Git-Tag: v4.1~430
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d83aefe0fe7541a3203d510d0e8ed303bbb79803;p=thirdparty%2Ftvheadend.git

descrambler: fix mm_descrambler_lock deadlock in the CAT callback, fixes #2636
---

diff --git a/src/descrambler/descrambler.c b/src/descrambler/descrambler.c
index b97c25d4e..e65848acd 100755
--- a/src/descrambler/descrambler.c
+++ b/src/descrambler/descrambler.c
@@ -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);