evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "usb: core: Add support to skip extended bus resume delay"

Browse source
This commit is contained in:
Linux Build Service Account 2016-11-11 20:05:48 -08:00 • committed by Gerrit - the friendly Code Review server
commit 20f034903f
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/usb/core/hub.c
View file

@ -48,6 +48,11 @@ static void hub_event(struct work_struct *work);
/* synchronize hub-port add/remove and peering operations */
DEFINE_MUTEX(usb_port_peer_mutex);
static bool skip_extended_resume_delay = 1;
module_param(skip_extended_resume_delay, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(skip_extended_resume_delay,
"removes extra delay added to finish bus resume");
/* cycle leds on hubs that aren't blinking for attention */
static bool blinkenlights = 0;
module_param(blinkenlights, bool, S_IRUGO);
@ -3434,7 +3439,9 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
/* drive resume for USB_RESUME_TIMEOUT msec */
dev_dbg(&udev->dev, "usb %sresume\n",
(PMSG_IS_AUTO(msg) ? "auto-" : ""));
msleep(USB_RESUME_TIMEOUT);
if (!skip_extended_resume_delay)
usleep_range(USB_RESUME_TIMEOUT * 1000,
(USB_RESUME_TIMEOUT + 1) * 1000);
/* Virtual root hubs can trigger on GET_PORT_STATUS to
* stop resume signaling. Then finish the resume
@ -3443,7 +3450,7 @@ int usb_port_resume(struct usb_device *udev, pm_message_t msg)
status = hub_port_status(hub, port1, &portstatus, &portchange);
/* TRSMRCY = 10 msec */
msleep(10);
usleep_range(10000, 10500);
}
SuspendCleared: