From owner-svn-src-all@FreeBSD.ORG Fri Apr 8 06:13:20 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48BEB106566C; Fri, 8 Apr 2011 06:13:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1CD138FC13; Fri, 8 Apr 2011 06:13:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p386DKQA065783; Fri, 8 Apr 2011 06:13:20 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p386DJjS065778; Fri, 8 Apr 2011 06:13:19 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201104080613.p386DJjS065778@svn.freebsd.org> From: Hans Petter Selasky Date: Fri, 8 Apr 2011 06:13:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220435 - in stable/8/sys: dev/usb/controller mips/atheros mips/rmi X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2011 06:13:20 -0000 Author: hselasky Date: Fri Apr 8 06:13:19 2011 New Revision: 220435 URL: http://svn.freebsd.org/changeset/base/220435 Log: MFC r220303 - Correct EHCI interrupt disabling at detach. Approved by: thompsa (mentor) Modified: stable/8/sys/dev/usb/controller/ehci_ixp4xx.c stable/8/sys/dev/usb/controller/ehci_pci.c stable/8/sys/mips/atheros/ar71xx_ehci.c stable/8/sys/mips/rmi/xls_ehci.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/usb/controller/ehci_ixp4xx.c ============================================================================== --- stable/8/sys/dev/usb/controller/ehci_ixp4xx.c Fri Apr 8 05:48:51 2011 (r220434) +++ stable/8/sys/dev/usb/controller/ehci_ixp4xx.c Fri Apr 8 06:13:19 2011 (r220435) @@ -264,7 +264,7 @@ ehci_ixp_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { Modified: stable/8/sys/dev/usb/controller/ehci_pci.c ============================================================================== --- stable/8/sys/dev/usb/controller/ehci_pci.c Fri Apr 8 05:48:51 2011 (r220434) +++ stable/8/sys/dev/usb/controller/ehci_pci.c Fri Apr 8 06:13:19 2011 (r220435) @@ -507,7 +507,7 @@ ehci_pci_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { /* Modified: stable/8/sys/mips/atheros/ar71xx_ehci.c ============================================================================== --- stable/8/sys/mips/atheros/ar71xx_ehci.c Fri Apr 8 05:48:51 2011 (r220434) +++ stable/8/sys/mips/atheros/ar71xx_ehci.c Fri Apr 8 06:13:19 2011 (r220435) @@ -229,7 +229,7 @@ ar71xx_ehci_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { Modified: stable/8/sys/mips/rmi/xls_ehci.c ============================================================================== --- stable/8/sys/mips/rmi/xls_ehci.c Fri Apr 8 05:48:51 2011 (r220434) +++ stable/8/sys/mips/rmi/xls_ehci.c Fri Apr 8 06:13:19 2011 (r220435) @@ -228,7 +228,7 @@ ehci_xls_detach(device_t self) * disable interrupts that might have been switched on in ehci_init */ if (sc->sc_io_res) { - EWRITE4(sc, EHCI_USBINTR, 0); + EOWRITE4(sc, EHCI_USBINTR, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) {