svn commit: r220435 - in stable/8/sys: dev/usb/controller mips/atheros mips/rmi

[Hans Petter Selasky]

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) {