speedtch cxacru.c,1.23,1.24

[Duncan Sands]

Update of /home/cvs/speedtch
In directory phoenix.infradead.org:/tmp/cvs-serv10083

Modified Files:
	cxacru.c 
Log Message:
usb_bulk_msg now takes a timeout in milliseconds.


Index: cxacru.c
===================================================================
RCS file: /home/cvs/speedtch/cxacru.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cxacru.c	1 Apr 2005 11:11:35 -0000	1.23
+++ cxacru.c	1 Apr 2005 12:17:57 -0000	1.24
@@ -68,7 +68,9 @@
 
 /* Timeout in jiffies */
 #define CMD_TIMEOUT	(2 * HZ)
+#define CMD_TIMEOUT_MS  2000
 #define DATA_TIMEOUT	(2 * HZ)
+#define DATA_TIMEOUT_MS 2000
 
 /* commands for interaction with the modem through the control channel before
  * firmware is loaded  */
@@ -494,7 +496,7 @@
 		offd += stride;
 		if ((offb >= PAGE_SIZE) || (offd >= size)) {
 			ret = usb_bulk_msg(usb_dev, usb_sndbulkpipe(usb_dev, CXACRU_EP_CMD),
-					   buf, offb, NULL, CMD_TIMEOUT);
+					   buf, offb, NULL, CMD_TIMEOUT_MS);
 			if (ret < 0) {
 				dbg("sending fw %#x failed", fw);
 				goto cleanup;