diff options
| author | Josef Karthauser <joe@FreeBSD.org> | 2002-04-01 21:18:50 +0000 |
|---|---|---|
| committer | Josef Karthauser <joe@FreeBSD.org> | 2002-04-01 21:18:50 +0000 |
| commit | a4a49508b4ddf1b482743f71bcd6707c9ce7b406 (patch) | |
| tree | 31ed95407405beb468f889dfa5bb57efca1d9f59 /sys | |
| parent | a011c2e7a85eb7d792da0a9423c675cf9c1b158c (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/uhci.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 62463a52b817..715d92b53941 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.131 2000/12/29 01:24:56 augustss Exp $ */ +/* $NetBSD: uhci.c,v 1.132 2001/01/20 23:36:02 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -683,7 +683,7 @@ uhci_power(int why, void *v) int cmd; int s; - s = splusb(); + s = splhardusb(); cmd = UREAD2(sc, UHCI_CMD); DPRINTF(("uhci_power: sc=%p, why=%d (was %d), cmd=0x%x\n", @@ -1215,13 +1215,9 @@ uhci_intr(void *arg) sc->sc_dying = 1; } - if (ack) { /* acknowledge the ints */ - UWRITE2(sc, UHCI_STS, ack); - } else { /* nothing to acknowledge */ - printf("%s: UHCI interrupt, STS = 0x%04x, but ack == 0\n", - USBDEVNAME(sc->sc_bus.bdev), status); - return (0); - } + if (!ack) + return (0); /* nothing to acknowledge */ + UWRITE2(sc, UHCI_STS, ack); /* acknowledge the ints */ sc->sc_bus.no_intrs++; usb_schedsoftintr(&sc->sc_bus); @@ -1525,7 +1521,7 @@ uhci_run(uhci_softc_t *sc, int run) u_int16_t cmd; run = run != 0; - s = splusb(); + s = splhardusb(); DPRINTF(("uhci_run: setting run=%d\n", run)); cmd = UREAD2(sc, UHCI_CMD); if (run) |