diff options
| author |   mglocker <mglocker@openbsd.org> | 2007-03-18 20:14:51 +0000 |
|---|---|---|
| committer | mglocker <mglocker@openbsd.org> | 2007-03-18 20:14:51 +0000 |
| commit | 5c2c2405fa31d0218cd1c7e8729399c181869af1 (patch) | |
| tree | 7db4ab809f3b8c34d158eb9134282ca6161f43f6 /sys/dev/usb/usb.c | |
| parent | It's not smart to use a space as a field separator when a space can (diff) | |
| download | wireguard-openbsd-5c2c2405fa31d0218cd1c7e8729399c181869af1.tar.xz wireguard-openbsd-5c2c2405fa31d0218cd1c7e8729399c181869af1.zip | |
Backout pascoe@'s last USB change because it page faults at attachment
time.
Chris; Get your shiz fixed and tested for the next time. We have
better todo then wasting our time by backing out untested stuff.
OK deraadt, OK ckuethe
Diffstat (limited to 'sys/dev/usb/usb.c')
| -rw-r--r-- | sys/dev/usb/usb.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c index c8256f255dd..b8012f31e27 100644 --- a/sys/dev/usb/usb.c +++ b/sys/dev/usb/usb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usb.c,v 1.36 2007/03/18 06:00:45 pascoe Exp $ */ +/* $OpenBSD: usb.c,v 1.37 2007/03/18 20:14:51 mglocker Exp $ */ /* $NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $ */ /* @@ -304,15 +304,9 @@ void usb_event_thread(void *arg) { struct usb_softc *sc = arg; - int pwrdly; DPRINTF(("usb_event_thread: start\n")); - /* Wait for power to come good. */ - pwrdly = sc->sc_bus->root_hub->hub->hubdesc.bPwrOn2PwrGood * - UHD_PWRON_FACTOR + USB_EXTRA_POWER_UP_TIME; - usb_delay_ms(sc->sc_bus, pwrdly); - /* USB1 threads wait for USB2 threads to finish their first probe. */ while (sc->sc_bus->usbrev != USBREV_2_0 && threads_pending) (void)tsleep((void *)&threads_pending, PWAIT, "config", 0); |