Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a28072b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents bdac3a9d 95c27754

drivers/usb/core/hub.c

+8 −2
Original line number Diff line number Diff line
@@ -50,6 +50,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, 0644);

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;

module_param(blinkenlights, bool, S_IRUGO);
@@ -3436,6 +3441,7 @@ 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-" : ""));

		if (!skip_extended_resume_delay)

			usleep_range(USB_RESUME_TIMEOUT * 1000,

					(USB_RESUME_TIMEOUT + 1) * 1000);