summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-20 06:54:11 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-09-20 06:54:11 +0000
commitd10c2f857dc5b717e571bfa61209ef39f6103007 (patch)
tree2a131205afcca3ee5fc12592ba8afc187da38a0e
parent3e3ff0cf0db089f1bc7cf6089dc74b51d0a3af70 (diff)
If during resume we get an interrupt, sure, be a bit noisy about it
for now. But since it is not being handled, do not ack it on the chip. Discussed with kettenis a while back
-rw-r--r--sys/dev/usb/uhci.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 6cb88b750c1..24e4f5cd7c0 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.82 2010/09/20 03:28:48 jsg Exp $ */
+/* $OpenBSD: uhci.c,v 1.83 2010/09/20 06:54:10 deraadt 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 $ */
@@ -1160,7 +1160,6 @@ uhci_intr1(uhci_softc_t *sc)
if (sc->sc_suspend != DVACT_RESUME) {
printf("%s: interrupt while not operating ignored\n",
sc->sc_bus.bdev.dv_xname);
- UWRITE2(sc, UHCI_STS, status); /* acknowledge the ints */
return (0);
}