[Pcsclite-cvs-commit] r5026 - /trunk/Drivers/ccid/src/ccid_usb.c

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Jun 22 09:13:45 2010
New Revision: 5026

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5026
Log:
OpenUSBByName(): call libusb_exit() if we can't use the reader

CloseUSB(): call libusb_exit() before exiting

Modified:
    trunk/Drivers/ccid/src/ccid_usb.c

Modified: trunk/Drivers/ccid/src/ccid_usb.c
URL: http://svn.debian.org/wsvn/pcsclite/trunk/Drivers/ccid/src/ccid_usb.c?rev=5026&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Tue Jun 22 09:13:45 2010
@@ -558,7 +558,10 @@
 	}
 end:
 	if (usbDevice[reader_index].dev_handle == NULL)
+	{
+		libusb_exit(NULL);
 		return STATUS_NO_SUCH_DEVICE;
+	}
 
 	/* free the libusb allocated list & devices */
 	libusb_free_device_list(devs, 1);
@@ -702,6 +705,8 @@
 		(void)libusb_release_interface(usbDevice[reader_index].dev_handle,
 			usbDevice[reader_index].interface);
 		(void)libusb_close(usbDevice[reader_index].dev_handle);
+
+		libusb_exit(NULL);
 	}
 
 	/* mark the resource unused */