From 6b00e274ed6bdce287a85a9408ecc3c7f7ce6b0b Mon Sep 17 00:00:00 2001
From: joe <joe@FreeBSD.org>
Date: Mon, 1 Apr 2002 13:36:09 +0000
Subject: 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. 	----------------------------

---
 sys/dev/usb/uhci.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'sys')

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);
-- 
cgit v1.1