From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 9 Apr 2014 20:30:02 +0000 (+0100)
Subject: linuxdvb: correct mistake in delsys enumeration caused by recent updates
X-Git-Tag: v4.1~2181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df11c19cfa9d69319e404a096e2077dc48340855;p=thirdparty%2Ftvheadend.git

linuxdvb: correct mistake in delsys enumeration caused by recent updates
---

diff --git a/src/input/mpegts/linuxdvb/linuxdvb_adapter.c b/src/input/mpegts/linuxdvb/linuxdvb_adapter.c
index 340c4ddc3..154e9a27f 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_adapter.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_adapter.c
@@ -184,7 +184,7 @@ static void
 linuxdvb_adapter_add ( const char *path )
 {
   extern int linuxdvb_adapter_mask;
-  int a, i, j, r, fd;
+  int a, i, j, r, fd, delsys;
   char fe_path[512], dmx_path[512], dvr_path[512];
   uuid_t uuid;
   linuxdvb_adapter_t *la = NULL;
@@ -316,9 +316,13 @@ linuxdvb_adapter_add ( const char *path )
 #if DVB_VER_ATLEAST(5,10)
     fetypes[type] = 1;
     for (j = 0; j < cmd.u.buffer.len; j++) {
+      delsys = cmd.u.buffer.data[j];
+
+      if ((delsys = linuxdvb2tvh_delsys(delsys)) == DVB_SYS_NONE)
+        continue;
 
       /* Invalid */
-      if ((type = dvb_delsys2type(cmd.u.buffer.data[j])) == DVB_TYPE_NONE)
+      if ((type = dvb_delsys2type(delsys)) == DVB_TYPE_NONE)
         continue;
 
       /* Couldn't find */