Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/usb fix port reset for non-ETTF case broken by previ...



details:   https://anonhg.NetBSD.org/src/rev/ff1df8083986
branches:  trunk
changeset: 761000:ff1df8083986
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Jan 18 15:05:03 2011 +0000

description:
fix port reset for non-ETTF case broken by previous commit

diffstat:

 sys/dev/usb/ehci.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 88acd0846f6e -r ff1df8083986 sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Tue Jan 18 15:00:22 2011 +0000
+++ b/sys/dev/usb/ehci.c        Tue Jan 18 15:05:03 2011 +0000
@@ -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);



Home | Main Index | Thread Index | Old Index