fix some 64bit issues, probably...

[usb-driver] / usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index a6d64ce824c9c8136155da5fab61dc5d4d4f1709..f5df8455653ed1ec77b2a21f3aa3ec0baaeddcf2 100644 (file)
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -37,6 +37,7 @@
 #include <signal.h>
 #include <pthread.h>
 #include <errno.h>
+#include <inttypes.h>
 #include "usb-driver.h"
 
 static int (*ioctl_func) (int, int, void *) = NULL;
@@ -46,7 +47,7 @@ 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;
 
@@ -710,7 +711,7 @@ 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 = -1;
        }