summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2019-03-01 16:43:20 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-03-01 20:53:41 +0100
commit5d5d44dec7270e06c74b2f83ebca1fc081971862 (patch)
tree3a9e61fde31e6522a80a9655e5c4fade5900d45d /drivers/usb
parent23f4e3d8b310abfa4adf6ac3e016804a4cccd464 (diff)
downloadlinux-5d5d44dec7270e06c74b2f83ebca1fc081971862.tar.bz2
usb: core: make default autosuspend delay configurable
Make the default autosuspend delay configurable at build time. This is useful for systems that require a non-standard value as it avoids relying on the command line being properly set. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/core/Kconfig12
-rw-r--r--drivers/usb/core/usb.c4
2 files changed, 14 insertions, 2 deletions
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index 4453e10b9dbb..bdb6bd0b63a6 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -91,3 +91,15 @@ config USB_LEDS_TRIGGER_USBPORT
This driver allows LEDs to be controlled by USB events. Enabling this
trigger allows specifying list of USB ports that should turn on LED
when some USB device gets connected.
+
+config USB_AUTOSUSPEND_DELAY
+ int "Default autosuspend delay"
+ depends on USB
+ default 2
+ help
+ The default autosuspend delay in seconds. Can be overridden
+ with the usbcore.autosuspend command line or module parameter.
+
+ The default value Linux has always had is 2 seconds. Change
+ this value if you want a different delay and cannot modify
+ the command line or module parameter.
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 9b5852e313f5..7fcb9f782931 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -64,8 +64,8 @@ int usb_disabled(void)
EXPORT_SYMBOL_GPL(usb_disabled);
#ifdef CONFIG_PM
-static int usb_autosuspend_delay = 2; /* Default delay value,
- * in seconds */
+/* Default delay value, in seconds */
+static int usb_autosuspend_delay = CONFIG_USB_AUTOSUSPEND_DELAY;
module_param_named(autosuspend, usb_autosuspend_delay, int, 0644);
MODULE_PARM_DESC(autosuspend, "default autosuspend delay");