summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorsoren <soren@NetBSD.org>2000-11-22 05:50:59 +0000
committersoren <soren@NetBSD.org>2000-11-22 05:50:59 +0000
commitefadefb53f358a79e8aaf83b2ad708cd8776563c (patch)
tree9ad67a3fef51670977677f25caf40e3b94ff4950 /sys
parent9c0026f5faff9e2a183ced40f90b2c96649c4621 (diff)
In uhci_intr(), only warn about power state confusion if the
interrupt was actually for us.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/uhci.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index c08d2d7d146..f5e8db63163 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.126 2000/11/10 14:11:49 augustss Exp $ */
+/* $NetBSD: uhci.c,v 1.127 2000/11/22 05:50:59 soren Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -1152,16 +1152,16 @@ uhci_intr(void *arg)
}
#endif
+ status = UREAD2(sc, UHCI_STS);
+ if (status == 0) /* The interrupt was not for us. */
+ return (0);
+
if (sc->sc_suspend != PWR_RESUME) {
printf("%s: interrupt while not operating ignored\n",
USBDEVNAME(sc->sc_bus.bdev));
return (0);
}
- status = UREAD2(sc, UHCI_STS);
- if (status == 0) /* The interrupt was not for us. */
- return (0);
-
#if defined(DIAGNOSTIC) && defined(__NetBSD__)
if (sc->sc_suspend != PWR_RESUME)
printf("uhci_intr: suspended sts=0x%x\n", status);