linuxdvb: minor corrections to the diseqc code.

diff --git a/Makefile b/Makefile
index 4525bfd8b574ca152764c0bcd5538b933883389d..9423a439dc0abe65c9802abd3608986577875b2b 100644 (file)
--- 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 250172443e195feecbd4c212eb5501795d22945d..081d2466a6b510bf672e7607af2f2986e91d80b5 100644 (file)
--- 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 ae86cb7ce71be05fbc86fcace12671133b72c4fe..68cad922122b568d49f80480e7e1925016242829 100644 (file)
--- 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) {