X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/usb-driver/blobdiff_plain/b72b86b42ae1c4139170de1fa98748feef11ed89..010cbaa6cd3ee6d94eda3e5327b7218a4b86f28f:/usb-driver.c

diff --git a/usb-driver.c b/usb-driver.c
index a3a2efb..8558c6a 100644
--- a/usb-driver.c
+++ b/usb-driver.c
@@ -47,12 +47,12 @@ static int modules_read = 0;
 static struct usb_bus *busses = NULL;
 static struct usb_device *usbdevice;
 static usb_dev_handle *usb_devhandle = NULL;
+static int usbinterface = -1;
 static unsigned long card_type;
 static int ints_enabled = 0;
 static pthread_mutex_t int_wait = PTHREAD_MUTEX_INITIALIZER;
 
 #define NO_WINDRVR 1
-/* #define DEBUG 1 */
 
 #ifdef DEBUG
 #define DPRINTF(format, args...) fprintf(stderr, format, ##args)
@@ -383,6 +383,7 @@ int do_wdioctl(int fd, unsigned int request, unsigned char *wdioctl) {
 					ret = usb_claim_interface(usb_devhandle, usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber);
 					if (!ret) {
 						if(!ret) {
+							usbinterface = usbdevice->config[0].interface[usi->dwInterfaceNum].altsetting[usi->dwAlternateSetting].bInterfaceNumber;
 							ret = usb_set_altinterface(usb_devhandle, usi->dwAlternateSetting);
 							if (ret)
 								fprintf(stderr, "usb_set_altinterface: %d\n", ret);
@@ -713,6 +714,14 @@ int close(int fd) {
 	
 	if (fd == windrvrfd && windrvrfd >= 0) {
 		DPRINTF("close windrvrfd\n");
+		if (usbinterface >= 0)
+			usb_release_interface(usb_devhandle, usbinterface);
+
+		if (usb_devhandle)
+			usb_close(usb_devhandle);
+
+		usb_devhandle = NULL;
+		usbinterface = -1;
 		windrvrfd = -1;
 	}