Module Name: src
Committed By: jmcneill
Date: Tue Jan 18 15:05:03 UTC 2011
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
fix port reset for non-ETTF case broken by previous commit
To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 src/sys/dev/usb/ehci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.172 src/sys/dev/usb/ehci.c:1.173
--- src/sys/dev/usb/ehci.c:1.172 Tue Jan 18 08:29:24 2011
+++ src/sys/dev/usb/ehci.c Tue Jan 18 15:05:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.172 2011/01/18 08:29:24 matt Exp $ */
+/* $NetBSD: ehci.c,v 1.173 2011/01/18 15:05:03 jmcneill Exp $ */
/*
* Copyright (c) 2004-2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.172 2011/01/18 08:29:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.173 2011/01/18 15:05:03 jmcneill Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -2353,7 +2353,7 @@
if (!(sc->sc_flags & EHCIF_ETTF)) {
/* Terminate reset sequence. */
v = EOREAD4(sc, port);
- EOWRITE4(sc, port, v);
+ EOWRITE4(sc, port, v & ~EHCI_PS_PR);
/* Wait for HC to complete reset. */
usb_delay_ms(&sc->sc_bus,
EHCI_PORT_RESET_COMPLETE);
