Skip to content

L
linux
Commit b4c1d6eb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Merge kroah.com:/home/greg/linux/BK/gregkh-2.5 

into kroah.com:/home/greg/linux/BK/work
parents f7148255 0d019273
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/usb/hub.c
View file @ b4c1d6eb
...@@ -655,11 +655,11 @@ void usb_hub_port_disable(struct usb_device *hub, int port) ...@@ -655,11 +655,11 @@ void usb_hub_port_disable(struct usb_device *hub, int port)
* Not covered by the spec - but easy to deal with. * Not covered by the spec - but easy to deal with.
* *
* This implementation uses 400ms minimum debounce timeout and checks * This implementation uses 400ms minimum debounce timeout and checks
* every 10ms for transient disconnects to restart the delay. * every 100ms for transient disconnects to restart the delay.
*/ */
#define HUB_DEBOUNCE_TIMEOUT 400 #define HUB_DEBOUNCE_TIMEOUT 400
#define HUB_DEBOUNCE_STEP 10 #define HUB_DEBOUNCE_STEP 100
/* return: -1 on error, 0 on success, 1 on disconnect. */ /* return: -1 on error, 0 on success, 1 on disconnect. */
static int usb_hub_port_debounce(struct usb_device *hub, int port) static int usb_hub_port_debounce(struct usb_device *hub, int port)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7