diff options
author | joe <joe@FreeBSD.org> | 2002-04-01 21:42:43 +0000 |
---|---|---|
committer | joe <joe@FreeBSD.org> | 2002-04-01 21:42:43 +0000 |
commit | a650ee5075b5876c3a9e89638f23eb30c8ca4262 (patch) | |
tree | baf9cd4ac18e92d7d3fcaa40c1eb480b42a5678a /sys | |
parent | 1f9ca3193732e910a1a2f6162841d6b3fab60a60 (diff) | |
download | FreeBSD-src-a650ee5075b5876c3a9e89638f23eb30c8ca4262.zip FreeBSD-src-a650ee5075b5876c3a9e89638f23eb30c8ca4262.tar.gz |
MFNetBSD:
revision 1.134
date: 2001/03/25 22:52:21; author: augustss; state: Exp; lines: +4 -1
Try to make resume work on more machines.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/usb/uhci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index dad6c56..cd28c2e 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.133 2001/01/21 02:39:52 augustss Exp $ */ +/* $NetBSD: uhci.c,v 1.134 2001/03/25 22:52:21 augustss Exp $ */ /* $FreeBSD$ */ /* @@ -704,6 +704,8 @@ uhci_power(int why, void *v) sc->sc_saved_frnum = UREAD2(sc, UHCI_FRNUM); sc->sc_saved_sof = UREAD1(sc, UHCI_SOF); + UWRITE2(sc, UHCI_INTR, 0); /* disable intrs */ + UHCICMD(sc, cmd | UHCI_CMD_EGSM); /* enter global suspend */ usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT); sc->sc_suspend = why; @@ -1179,6 +1181,7 @@ uhci_intr(void *arg) if (sc->sc_suspend != PWR_RESUME) { printf("%s: interrupt while not operating ignored\n", USBDEVNAME(sc->sc_bus.bdev)); + UWRITE2(sc, UHCI_STS, status); /* acknowledge the ints */ return (0); } |