Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb In uhci_intr(), only warn about power state conf...



details:   https://anonhg.NetBSD.org/src/rev/bd192155fd74
branches:  trunk
changeset: 499544:bd192155fd74
user:      soren <soren%NetBSD.org@localhost>
date:      Wed Nov 22 05:50:59 2000 +0000

description:
In uhci_intr(), only warn about power state confusion if the
interrupt was actually for us.

diffstat:

 sys/dev/usb/uhci.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r df911a919231 -r bd192155fd74 sys/dev/usb/uhci.c
--- a/sys/dev/usb/uhci.c        Wed Nov 22 04:28:13 2000 +0000
+++ b/sys/dev/usb/uhci.c        Wed Nov 22 05:50:59 2000 +0000
@@ -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 @@
        }
 #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);



Home | Main Index | Thread Index | Old Index