diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2007-03-18 20:14:52 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2007-03-18 20:14:52 +0000 |
| commit | 2820d116979e135234d1261ada149c763a9c0e8f (patch) | |
| tree | 0bf89f6bb84c1a9536807c2a741a63210ccaa24d /sys/dev/usb/uhub.c | |
| parent | ac1137b6a847c7588490a81e52944d5a73b778ac (diff) | |
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/uhub.c')
| -rw-r--r-- | sys/dev/usb/uhub.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index 056158408e2..631607cdb14 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhub.c,v 1.35 2007/03/18 06:00:45 pascoe Exp $ */ +/* $OpenBSD: uhub.c,v 1.36 2007/03/18 20:14:51 mglocker Exp $ */ /* $NetBSD: uhub.c,v 1.64 2003/02/08 03:32:51 ichiro Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */ @@ -338,11 +338,9 @@ USB_ATTACH(uhub) USBDEVNAME(sc->sc_dev), port, usbd_errstr(err)); DPRINTF(("usb_init_port: turn on port %d power\n", port)); - } - - /* Wait for stable power. Root hubs delay in their event thread. */ - if (dev->powersrc->parent != NULL) + /* Wait for stable power. */ usbd_delay_ms(dev, pwrdly); + } /* The usual exploration will finish the setup. */ |