diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-10-04 22:55:31 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-10-04 22:55:31 +0000 |
| commit | c080b6227e3dee039c382bfec0d0988bf848fa22 (patch) | |
| tree | 42020b9ad1401c6bc3351db2d4c67c205952489c /sys/dev/usb/uhci.c | |
| parent | adca01e69a0e30822037634556dbacc7f25acc3b (diff) | |
Make sure we don't enable host controller interrupts until all
initialization is finished.
From augustss NetBSD
ok dlg@ pascoe@
Diffstat (limited to 'sys/dev/usb/uhci.c')
| -rw-r--r-- | sys/dev/usb/uhci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index c04ec682c48..bad1eec9e77 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhci.c,v 1.38 2005/04/19 08:33:26 damien Exp $ */ +/* $OpenBSD: uhci.c,v 1.39 2005/10/04 22:55:30 brad Exp $ */ /* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ @@ -521,12 +521,12 @@ uhci_init(uhci_softc_t *sc) sc->sc_shutdownhook = shutdownhook_establish(uhci_shutdown, sc); #endif + UHCICMD(sc, UHCI_CMD_MAXP); /* Assume 64 byte packets at frame end */ + DPRINTFN(1,("uhci_init: enabling\n")); UWRITE2(sc, UHCI_INTR, UHCI_INTR_TOCRCIE | UHCI_INTR_RIE | UHCI_INTR_IOCE | UHCI_INTR_SPIE); /* enable interrupts */ - UHCICMD(sc, UHCI_CMD_MAXP); /* Assume 64 byte packets at frame end */ - return (uhci_run(sc, 1)); /* and here we go... */ } |