ChangeSet 1.2020.1.61, 2005/03/08 00:06:00-08:00, [EMAIL PROTECTED]
[PATCH] usb/hid-core: change parameters of usb_{control,bulk}_msg() to msecs
Change units of parameters being passed to usb_{control,bulk}_msg() to
milliseconds. USB_CTRL_{GET,SET}_TIMEOUT were converted to milliseconds
in a separate patch. Patch is compile-tested.
Signed-off-by: Nishanth Aravamudan <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
drivers/usb/input/hid-core.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff -Nru a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
--- a/drivers/usb/input/hid-core.c 2005-03-08 16:49:59 -08:00
+++ b/drivers/usb/input/hid-core.c 2005-03-08 16:49:59 -08:00
@@ -1289,7 +1289,7 @@
do {
result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
USB_REQ_GET_DESCRIPTOR, USB_RECIP_INTERFACE |
USB_DIR_IN,
- (type << 8), ifnum, buf, size, HZ *
USB_CTRL_GET_TIMEOUT);
+ (type << 8), ifnum, buf, size,
USB_CTRL_GET_TIMEOUT);
retries--;
} while (result < size && retries);
return result;
@@ -1340,7 +1340,7 @@
*/
usb_control_msg(hid->dev, usb_sndctrlpipe(hid->dev, 0),
HID_REQ_SET_IDLE, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
(1 << 8),
- hid->ifnum, NULL, 0, HZ * USB_CTRL_SET_TIMEOUT);
+ hid->ifnum, NULL, 0, USB_CTRL_SET_TIMEOUT);
report_enum = hid->report_enum + HID_INPUT_REPORT;
list = report_enum->report_list.next;
@@ -1382,7 +1382,7 @@
report = (struct hid_report *) list;
usb_control_msg(hid->dev, usb_sndctrlpipe(hid->dev, 0),
HID_REQ_SET_IDLE, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
report->id,
- hid->ifnum, NULL, 0, HZ * USB_CTRL_SET_TIMEOUT);
+ hid->ifnum, NULL, 0, USB_CTRL_SET_TIMEOUT);
list = list->next;
}
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_ide95&alloc_id396&op=click
_______________________________________________
[email protected]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
