X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/f0bfb2db7dd53c2ac7c8376805ad596d080bddc8..f42065a398f7d8bcc6d39dab972bf47ed09c4c76:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index d38da3e..d7d4fa7 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -37,21 +37,22 @@
 #include <signal.h>
 #include <pthread.h>
 #include <errno.h>
+#include <inttypes.h>
 #include "usb-driver.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
-static int windrvrfd = 0;
-FILE *modulesfp;
+static int windrvrfd = -1;
+FILE *modulesfp = NULL;
 static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
 static usb_dev_handle *usb_devhandle = NULL;
-static unsigned long card_type;
+static uint32_t card_type;
 static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
-#undef DEBUG
+/* #define DEBUG 1 */
 
 #ifdef DEBUG
 #define DPRINTF(format, args...) fprintf(stderr, format, ##args)
@@ -660,7 +661,7 @@ int ioctl(int fd, int request, ...) {
 	argp = va_arg (args, void *);
 	va_end (args);
 
-	if (windrvrfd && (fd == windrvrfd))
+	if (fd == windrvrfd)
 		ret = do_wdioctl(fd, request, argp);
 	else
 		ret = (*ioctl_func) (fd, request, argp);
@@ -710,9 +711,9 @@ int close(int fd) {
 	if (!func)
 		func = (int (*) (int)) dlsym(RTLD_NEXT, "close");
 	
-	if (fd == windrvrfd) {
+	if (fd == windrvrfd && windrvrfd >= 0) {
 		DPRINTF("close windrvrfd\n");
-		windrvrfd = 0;
+		windrvrfd = -1;
 	}
 
 	return (*func) (fd);