diff options
| author | hselasky <hselasky@FreeBSD.org> | 2014-10-09 06:24:06 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2014-10-09 06:24:06 +0000 |
| commit | 95a86b5ccc3c102cf06109fa64a760749c8279c2 (patch) | |
| tree | 6352af77723e211c7e4b79c84eaf497db5524876 /sys/dev/usb/controller/usb_controller.c | |
| parent | 80ce4ebd6fc32e4da5926785ee81126f7bdb4a25 (diff) | |
| download | FreeBSD-src-95a86b5ccc3c102cf06109fa64a760749c8279c2.zip FreeBSD-src-95a86b5ccc3c102cf06109fa64a760749c8279c2.tar.gz | |
Refine support for disabling USB enumeration to allow device detach
and suspend and resume of existing devices.
MFC after: 2 weeks
Diffstat (limited to 'sys/dev/usb/controller/usb_controller.c')
| -rw-r--r-- | sys/dev/usb/controller/usb_controller.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c index 1d202dd..dc10591 100644 --- a/sys/dev/usb/controller/usb_controller.c +++ b/sys/dev/usb/controller/usb_controller.c @@ -102,14 +102,6 @@ static int usb_no_shutdown_wait = 0; SYSCTL_INT(_hw_usb, OID_AUTO, no_shutdown_wait, CTLFLAG_RWTUN, &usb_no_shutdown_wait, 0, "No USB device waiting at system shutdown."); -#if USB_HAVE_DISABLE_ENUM -static int usb_disable_enumeration = 0; -SYSCTL_INT(_hw_usb, OID_AUTO, disable_enumeration, CTLFLAG_RWTUN, - &usb_disable_enumeration, 0, "Set to disable all USB device enumeration."); -#else -#define usb_disable_enumeration 0 -#endif - static devclass_t usb_devclass; static device_method_t usb_methods[] = { @@ -379,8 +371,7 @@ usb_bus_explore(struct usb_proc_msg *pm) USB_BUS_LOCK(bus); } - if (usb_disable_enumeration == 0 && - udev != NULL && udev->hub != NULL) { + if (udev != NULL && udev->hub != NULL) { if (bus->do_probe) { bus->do_probe = 0; |
