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/ehci.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/ehci.c')
| -rw-r--r-- | sys/dev/usb/ehci.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 0b6392dfb7e..3bed1926127 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ehci.c,v 1.49 2005/09/24 07:28:58 pascoe Exp $ */ +/* $OpenBSD: ehci.c,v 1.50 2005/10/04 22:55:30 brad Exp $ */ /* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */ /* @@ -477,9 +477,6 @@ ehci_init(ehci_softc_t *sc) lockinit(&sc->sc_doorbell_lock, PZERO, "ehcidb", 0, 0); - /* Enable interrupts */ - EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs); - /* Turn on controller */ EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_ITC_2 | /* 2 microframes */ @@ -502,6 +499,10 @@ ehci_init(ehci_softc_t *sc) return (USBD_IOERROR); } + /* Enable interrupts */ + DPRINTFN(1,("ehci_init: enabling\n")); + EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs); + return (USBD_NORMAL_COMPLETION); #if 0 |