[patch] Patch fix timeout in usb_control_msg function

lirc_igorplugusb_hz_patch.diff (text/plain), 1.29 KB, created by Paul on 2010-02-01 08:50:45 UTC

--- lirc_igorplugusb.c	2010-01-31 21:36:03.000000000 +0100
+++ lirc_igorplugusb.c.changed	2010-02-01 09:32:48.000000000 +0100
@@ -65,7 +65,7 @@
 #include "drivers/lirc_dev/lirc_dev.h"
 
 #if !defined(KERNEL_2_5)
-#define USB_CTRL_GET_TIMEOUT    5
+#define USB_CTRL_GET_TIMEOUT    5*HZ
 #endif
 
 /* module identification */
@@ -290,7 +290,7 @@
 	      GET_INFRACODE, USB_TYPE_VENDOR|USB_DIR_IN,
 	      0/* offset */, /*unused*/0,
 	      ir->buf_in, ir->len_in,
-	      /*timeout*/HZ * USB_CTRL_GET_TIMEOUT);
+	      /*timeout*/USB_CTRL_GET_TIMEOUT);
 	if (ret > 0) {
 		int i = DEVICE_HEADERLEN;
 		lirc_t code, timediff;
@@ -346,7 +346,7 @@
 		      SET_INFRABUFFER_EMPTY, USB_TYPE_VENDOR|USB_DIR_IN,
 		      /*unused*/0, /*unused*/0,
 		      /*dummy*/ir->buf_in, /*dummy*/ir->len_in,
-		      /*timeout*/HZ * USB_CTRL_GET_TIMEOUT);
+		      /*timeout*/USB_CTRL_GET_TIMEOUT);
 		if (ret < 0)
 			printk(KERN_WARNING DRIVER_NAME
 			       "[%d]: SET_INFRABUFFER_EMPTY: error %d\n",
@@ -518,7 +518,7 @@
 		SET_INFRABUFFER_EMPTY, USB_TYPE_VENDOR|USB_DIR_IN,
 		/*unused*/0, /*unused*/0,
 		/*dummy*/ir->buf_in, /*dummy*/ir->len_in,
-		/*timeout*/HZ * USB_CTRL_GET_TIMEOUT);
+		/*timeout*/USB_CTRL_GET_TIMEOUT);
 	if (ret < 0)
 		printk(KERN_WARNING DRIVER_NAME
 		       "[%d]: SET_INFRABUFFER_EMPTY: error %d\n",