summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/uhci.c
diff options
context:
space:
mode:
authorjoe <joe@FreeBSD.org>2002-04-01 20:04:00 +0000
committerjoe <joe@FreeBSD.org>2002-04-01 20:04:00 +0000
commit628953224befaa49ea5306bf2e52a423cff8b111 (patch)
tree6128893c3dcd35e8b4b198c2d759db5b634fcfdb /sys/dev/usb/uhci.c
parentc4b43c0b29a7c90015026e318bca849ed1d9291a (diff)
downloadFreeBSD-src-628953224befaa49ea5306bf2e52a423cff8b111.zip
FreeBSD-src-628953224befaa49ea5306bf2e52a423cff8b111.tar.gz
MFNetBSD:
revision 1.127 date: 2000/11/22 05:50:59; author: soren; state: Exp; lines: +5 -5 In uhci_intr(), only warn about power state confusion if the interrupt was actually for us.
Diffstat (limited to 'sys/dev/usb/uhci.c')
-rw-r--r--sys/dev/usb/uhci.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 474d1db..dc01780 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$ */
/*
@@ -1172,6 +1172,9 @@ uhci_intr(void *arg)
uhci_dumpregs(sc);
}
#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",
@@ -1179,10 +1182,6 @@ uhci_intr(void *arg)
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);
OpenPOWER on IntegriCloud