From: Adam Sutton <dev@adamsutton.me.uk>
Date: Tue, 25 Jun 2013 15:11:38 +0000 (+0100)
Subject: linuxdvb: minor corrections to the diseqc code.
X-Git-Tag: v3.9^2~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f286913dea68efb0355c73de6dcf00d66232bfb;p=thirdparty%2Ftvheadend.git

linuxdvb: minor corrections to the diseqc code.
---

diff --git a/Makefile b/Makefile
index 4525bfd8b..9423a439d 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,6 @@ SRCS-${CONFIG_LINUXDVB} += \
         src/input/mpegts/linuxdvb/linuxdvb_lnb.c \
         src/input/mpegts/linuxdvb/linuxdvb_switch.c \
         src/input/mpegts/linuxdvb/linuxdvb_rotor.c \
-        src/input/mpegts/linuxdvb/diseqc.c
 
 # IPTV
 SRCS-${CONFIG_IPTV} += \
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_lnb.c b/src/input/mpegts/linuxdvb/linuxdvb_lnb.c
index 250172443..081d2466a 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_lnb.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_lnb.c
@@ -211,9 +211,11 @@ linuxdvb_lnb_create0
   ( const char *name, htsmsg_t *conf )
 {
   int i;
-  for (i = 0; i < ARRAY_SIZE(linuxdvb_lnb_list); i++) {
-    if (!strcmp(linuxdvb_lnb_list[i].lnb_name, name))
-      return (linuxdvb_lnb_t*)&linuxdvb_lnb_list[i];
+  if (name) {
+    for (i = 0; i < ARRAY_SIZE(linuxdvb_lnb_list); i++) {
+      if (!strcmp(linuxdvb_lnb_list[i].lnb_name, name))
+        return (linuxdvb_lnb_t*)&linuxdvb_lnb_list[i];
+    }
   }
   return (linuxdvb_lnb_t*)linuxdvb_lnb_list; // Universal
 }
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_rotor.c b/src/input/mpegts/linuxdvb/linuxdvb_rotor.c
index ae86cb7ce..68cad9221 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_rotor.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_rotor.c
@@ -249,6 +249,7 @@ linuxdvb_diseqc_t *
 linuxdvb_rotor_create0
   ( const char *name, htsmsg_t *conf )
 {
+  if (!name) return NULL;
   linuxdvb_diseqc_t *ld
     = linuxdvb_diseqc_create(linuxdvb_rotor, NULL, conf);
   if (ld) {