]> git.neil.brown.name Git - history.git/commitdiff
[WATCHDOG] pcwd_usb: usb_control_msg-timeout-patch
authorWim Van Sebroeck <wim@iguana.be>
Tue, 15 Mar 2005 21:32:57 +0000 (22:32 +0100)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 15 Mar 2005 21:32:57 +0000 (22:32 +0100)
set timeout in usb_control_msg to USB_COMMAND_TIMEOUT instead of a
full second.

drivers/char/watchdog/pcwd_usb.c

index 7106c15d7a30a6d96e18a7bd6b2da88367787fbe..1127201d73b8940d3205c1a244f5b4920c4b42ca 100644 (file)
@@ -56,8 +56,8 @@
 
 
 /* Module and Version Information */
-#define DRIVER_VERSION "1.00"
-#define DRIVER_DATE "12 Jun 2004"
+#define DRIVER_VERSION "1.01"
+#define DRIVER_DATE "15 Mar 2005"
 #define DRIVER_AUTHOR "Wim Van Sebroeck <wim@iguana.be>"
 #define DRIVER_DESC "Berkshire USB-PC Watchdog driver"
 #define DRIVER_LICENSE "GPL"
@@ -227,7 +227,7 @@ static int usb_pcwd_send_command(struct usb_pcwd_private *usb_pcwd, unsigned cha
        if (usb_control_msg(usb_pcwd->udev, usb_sndctrlpipe(usb_pcwd->udev, 0),
                        HID_REQ_SET_REPORT, HID_DT_REPORT,
                        0x0200, usb_pcwd->interface_number, buf, sizeof(buf),
-                       1000) != sizeof(buf)) {
+                       USB_COMMAND_TIMEOUT) != sizeof(buf)) {
                dbg("usb_pcwd_send_command: error in usb_control_msg for cmd 0x%x 0x%x 0x%x\n", cmd, *msb, *lsb);
        }
        /* wait till the usb card processed the command,