Fixed checking CA capabilities with the dvb-kernel driver

3 files changed, 7 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 67105bb3..536590af 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -733,3 +733,6 @@ Thomas Keil <tk@commedia-group.com>
  that a channel only qualifies as "previous" if it has been selected for at least
  3 seconds
  for reporting a bug in handling the color buttons in the "Edit channel" menu
+
+Kenneth Aafløy <ke-aa@frisurf.no>
+ for fixing checking CA capabilities with the dvb-kernel driver
diff --git a/HISTORY b/HISTORY
index 6988bc94..384634d7 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2273,3 +2273,5 @@ Video Disk Recorder Revision History
   Keil for reporting this one).
 - Fixed an occasional "Broken pipe" error in SVDRP connections (thanks to Gerhard
   Steiner for reporting this one).
+- Fixed checking CA capabilities with the dvb-kernel driver (thanks to Kenneth
+  Aafløy).
diff --git a/ci.c b/ci.c
index 3575d142..e94c20a0 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.15 2003/05/25 11:45:11 kls Exp $
+ * $Id: ci.c 1.16 2003/08/02 10:00:01 kls Exp $
  */
 
 /* XXX TODO
@@ -1314,7 +1314,7 @@ cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
         int NumSlots = Caps.slot_num;
         if (NumSlots > 0) {
            //XXX dsyslog("CAM: found %d CAM slots", NumSlots); // TODO let's do this only once we can be sure that there _really_ is a CAM adapter!
-           if (Caps.slot_type == CA_CI_LINK)
+           if ((Caps.slot_type & CA_CI_LINK) != 0)
               return new cCiHandler(fd_ca, NumSlots);
            else
               isyslog("CAM doesn't support link layer interface");