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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Tue Mar 31 09:30:01 2009
New Revision: 3405

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3405
Log:
OpenUSBByName(): support more than one composite or
composite-as-multislot readers

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=3405&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Tue Mar 31 09:30:01 2009
@@ -376,6 +376,10 @@
 							/* the CCID interfaces are 1 and 2 */
 							static int static_interface = 1;
 							interface_number = static_interface++;
+
+							/* reset for a next reader */
+							if (static_interface > 2)
+								static_interface = 1;
 						}
 					}
 #endif
@@ -465,7 +469,8 @@
 						if (0 == num)
 							DEBUG_CRITICAL3("Can't find a CCID interface on %s/%s",
 								bus->dirname, dev->filename);
-						return STATUS_UNSUCCESSFUL;
+						interface_number = -1;
+						continue;
 					}
 
 					if (usb_interface->altsetting->extralen != 54)