dvbcam: Fixed CAM searching

Signed-off-by: Jasmin Jessich <jasmin@anw.at>

diff --git a/src/descrambler.h b/src/descrambler.h
index 631b74c291ad4895ee5a43c08dc82ff3f9244cc8..99da06b1f825ceb6b2c5d61364ecb87a1b33371e 100644 (file)
--- a/src/descrambler.h
+++ b/src/descrambler.h
@@ -87,7 +87,7 @@ typedef struct th_descrambler_key {
 typedef struct th_descrambler_runtime {
   th_descrambler_t *dr_descrambler;
   struct service *dr_service;
-  int    (*dr_descramble)(struct th_descrambler *d, const uint8_t *tsb, int len);
+  int    (*dr_descramble)(struct th_descrambler *td, const uint8_t *tsb, int len);
   int      dr_ca_count;
   int      dr_ca_resolved;
   int      dr_ca_failed;

diff --git a/src/descrambler/dvbcam.c b/src/descrambler/dvbcam.c
index 4495cfcaa85483a99c0118608cd4529b90ac9f6b..6b7279653b09a02ae04823994f27ed886e1b33de 100644 (file)
--- a/src/descrambler/dvbcam.c
+++ b/src/descrambler/dvbcam.c
@@ -298,7 +298,9 @@ dvbcam_service_start(caclient_t *cac, service_t *t)
       if (c->use)
         TAILQ_FOREACH(ac, &dvbcam_active_cams, global_link)
           if (dvbcam_ca_lookup(ac, ((mpegts_service_t *)t)->s_dvb_active_input, c->caid))
-            break;
+            goto end_of_search_for_cam;
+
+end_of_search_for_cam:
 
   if (ac == NULL)
     goto end;