X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/3eee002c15edabb57e820b2b79d664cacbdbce56..5029ac18d71c1515a6d7c565d7eeb308e82d194b:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index 18d6331..e620145 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -636,7 +636,10 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 #ifndef NO_WINDRVR
 				ret = (*ioctl_func) (fd, request, wdioctl);
 #else
-				pport->close(cr->hCard);
+				if (pport)
+					pport->close(cr->hCard);
+
+				pport = NULL;
 #endif
 			}
 			break;
@@ -891,10 +894,7 @@ int access(const char *pathname, int mode) {
 	if (!func)
 		func = (int (*) (const char*, int)) dlsym(RTLD_NEXT, "access");
 
-	if (!pathname)
-		return -1;
-	
-	if (!strcmp(pathname, "/dev/windrvr6")) {
+	if (pathname && !strcmp(pathname, "/dev/windrvr6")) {
 		return 0;
 	} else {
 		return (*func)(pathname, mode);