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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu May 12 12:54:22 2011
New Revision: 5739

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5739
Log:
OpenUSBByName(): move declaration of readerID outside of the
USE_COMPOSITE_AS_MULTISLOT case so that the variable can also be used
elsewhere

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=5739&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Thu May 12 12:54:22 2011
@@ -321,13 +321,12 @@
 				int interface;
 				int num = 0;
 				const unsigned char *device_descriptor;
+				int readerID = (vendorID << 16) + productID;
 
 #ifdef USE_COMPOSITE_AS_MULTISLOT
 				static int static_interface = 1;
 
 				/* simulate a composite device as when libudev is used */
-				int readerID = (vendorID << 16) + productID;
-
 				if ((GEMALTOPROXDU == readerID)
 					|| (GEMALTOPROXSU == readerID))
 				{