[Pcsclite-cvs-commit] r2291 - trunk/Drivers/ccid/src

[Ludovic Rousseau]

Author: rousseau
Date: 2007-01-02 17:23:04 +0100 (Tue, 02 Jan 2007)
New Revision: 2291

Modified:
   trunk/Drivers/ccid/src/ccid_usb.c
Log:
revert revisions 2289 and 2290

It is not the correct solution to the problem


Modified: trunk/Drivers/ccid/src/ccid_usb.c
===================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c	2007-01-02 14:28:08 UTC (rev 2290)
+++ trunk/Drivers/ccid/src/ccid_usb.c	2007-01-02 16:23:04 UTC (rev 2291)
@@ -458,9 +458,6 @@
 	int rv;
 	char debug_header[] = "-> 121234 ";
 
-	if (usbDevice[reader_index].dev == NULL)
-		return STATUS_UNSUCCESSFUL;
-
 	sprintf(debug_header, "-> %06X ", (int)reader_index);
 
 	DEBUG_XXD(debug_header, buffer, length);
@@ -481,10 +478,7 @@
 			DEBUG_CRITICAL2("usb_bulk_write(no device): %s", strerror(errno));
 
 		if (ENODEV == errno)
-		{
-			CloseUSB(reader_index);
 			return STATUS_NO_SUCH_DEVICE;
-		}
 
 		return STATUS_UNSUCCESSFUL;
 	}
@@ -505,9 +499,6 @@
 	char debug_header[] = "<- 121234 ";
 	_ccid_descriptor *ccid_descriptor = get_ccid_descriptor(reader_index);
 
-	if (usbDevice[reader_index].dev == NULL)
-		return STATUS_UNSUCCESSFUL;
-
 read_again:
 	sprintf(debug_header, "<- %06X ", (int)reader_index);
 
@@ -528,10 +519,7 @@
 			DEBUG_CRITICAL2("usb_bulk_read(no device): %s", strerror(errno));
 
 		if (ENODEV == errno)
-		{
-			CloseUSB(reader_index);
 			return STATUS_NO_SUCH_DEVICE;
-		}
 
 		return STATUS_UNSUCCESSFUL;
 	}