From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 17 Jan 2018 18:49:04 +0000 (+0100)
Subject: dvbcam: another lock order fix
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21bd334db80e2cf19f8eec392bdb369530f04216;p=thirdparty%2Ftvheadend.git

dvbcam: another lock order fix
---

diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c
index c23bcf670..d9a3e4049 100644
--- a/src/descrambler/dvbcam.c
+++ b/src/descrambler/dvbcam.c
@@ -200,7 +200,7 @@ dvbcam_register_cam(linuxdvb_ca_t * lca, uint16_t * caids,
 reterr:
   pthread_mutex_unlock(&dvbcam_mutex);
 
-  if (call_update == NULL)
+  if (call_update)
     dvbcam_status_update();
 
 }
@@ -213,6 +213,7 @@ dvbcam_unregister_cam(linuxdvb_ca_t *lca)
 {
   dvbcam_active_cam_t *ac, *ac_next;
   dvbcam_active_service_t *as;
+  int call_update;
 
   tvhtrace(LS_DVBCAM, "unregister cam %s", lca->lca_name);
 
@@ -235,10 +236,12 @@ dvbcam_unregister_cam(linuxdvb_ca_t *lca)
     }
   }
 
-  if (TAILQ_EMPTY(&dvbcam_active_cams))
-    dvbcam_status_update();
+  call_update = TAILQ_EMPTY(&dvbcam_active_cams);
 
   pthread_mutex_unlock(&dvbcam_mutex);
+
+  if (call_update)
+    dvbcam_status_update();
 }
 
 /*