diff options
| author | joe <joe@FreeBSD.org> | 2002-04-01 13:36:09 +0000 |
|---|---|---|
| committer | joe <joe@FreeBSD.org> | 2002-04-01 13:36:09 +0000 |
| commit | 6b00e274ed6bdce287a85a9408ecc3c7f7ce6b0b (patch) | |
| tree | 5e5206d9e526de5facdd647eba59b94b91237cc5 /sys | |
| parent | 01f20a01567458522cb83431fb27662c972d0c1f (diff) | |
| download | FreeBSD-src-6b00e274ed6bdce287a85a9408ecc3c7f7ce6b0b.zip FreeBSD-src-6b00e274ed6bdce287a85a9408ecc3c7f7ce6b0b.tar.gz | |
Merge from NetBSD:
----------------------------
revision 1.117
date: 2000/05/30 09:26:06; author: augustss; lines: +7 -1
As a safety, check that the controller is not suspended when we get
an interrupt.
----------------------------
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/uhci.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index fef5307..f674333 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.112 2000/04/25 14:28:14 augustss Exp $ */ +/* $NetBSD: uhci.c,v 1.118 2000/05/30 16:56:54 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -1168,6 +1168,12 @@ uhci_intr(void *arg) } #endif + 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); |
