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

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Thu Jun 26 13:41:44 2008
New Revision: 3026

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=3026
Log:
InterruptRead(): use a 2 seconds timeout since it is not possible for
pcscd to kill the polling thread.

See thread on libusb-devel http://sourceforge.net/mailarchive/forum.php?thread_name=baabf6440805290726s228bce20r5073d55d8d56241b%40mail.gmail.com&forum_name=libusb-devel

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=3026&op=diff
==============================================================================
--- trunk/Drivers/ccid/src/ccid_usb.c (original)
+++ trunk/Drivers/ccid/src/ccid_usb.c Thu Jun 26 13:41:44 2008
@@ -858,7 +858,7 @@
 {
 	int ret;
 	char buffer[8];
-	int timeout = 60*60*1000; /* 60 minutes */
+	int timeout = 2*1000; /* 2 seconds */
 	static int hasfailed = FALSE;
 
 	if (hasfailed)
@@ -878,8 +878,8 @@
 	if (ret < 0)
 	{
 		/* if usb_interrupt_read() times out we get EILSEQ or EAGAIN */
-		if ((errno != EILSEQ) && (errno != EAGAIN))
-			DEBUG_CRITICAL4("usb_interrupt_read(%s/%s): %s",
+		if ((errno != EILSEQ) && (errno != EAGAIN) && (errno != 0))
+			DEBUG_COMM4("usb_interrupt_read(%s/%s): %s",
 					usbDevice[reader_index].dirname,
 					usbDevice[reader_index].filename, strerror(errno));
 	}