diff options
| author | hselasky <hselasky@FreeBSD.org> | 2011-04-03 20:17:49 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2011-04-03 20:17:49 +0000 |
| commit | 58267dbb2ec6d75b97dc1de7caeb7995984e2149 (patch) | |
| tree | 2d91f1eb2cbb73a9b6977b59240b65e17c036bee /sys | |
| parent | e36db9e5f9c987b8da6840ba212fd09ad1a51705 (diff) | |
| download | FreeBSD-src-58267dbb2ec6d75b97dc1de7caeb7995984e2149.zip FreeBSD-src-58267dbb2ec6d75b97dc1de7caeb7995984e2149.tar.gz | |
- Correct EHCI interrupt disabling at detach.
Submitted by: Luiz Otavio O Souza
MFC after: 7 days
Approved by: thompsa (mentor)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arm/econa/ehci_ebus.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_ixp4xx.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_mv.c | 2 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_pci.c | 2 | ||||
| -rw-r--r-- | sys/mips/atheros/ar71xx_ehci.c | 2 | ||||
| -rw-r--r-- | sys/mips/rmi/xls_ehci.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sys/arm/econa/ehci_ebus.c b/sys/arm/econa/ehci_ebus.c index a3499c9..86180c3 100644 --- a/sys/arm/econa/ehci_ebus.c +++ b/sys/arm/econa/ehci_ebus.c @@ -241,7 +241,7 @@ ehci_ebus_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); EWRITE4(sc, USB_BRIDGE_INTR_MASK, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c index 706fb06..79e1ccc 100644 --- a/sys/dev/usb/controller/ehci_ixp4xx.c +++ b/sys/dev/usb/controller/ehci_ixp4xx.c @@ -263,7 +263,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) { diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c index 06a1f20..2459ab9 100644 --- a/sys/dev/usb/controller/ehci_mv.c +++ b/sys/dev/usb/controller/ehci_mv.c @@ -295,7 +295,7 @@ mv_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); EWRITE4(sc, USB_BRIDGE_INTR_MASK, 0); } if (sc->sc_irq_res && sc->sc_intr_hdl) { diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c index 15cf8ce..bd160e4 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -506,7 +506,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) { /* diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c index ffa6f00..42e750a 100644 --- a/sys/mips/atheros/ar71xx_ehci.c +++ b/sys/mips/atheros/ar71xx_ehci.c @@ -250,7 +250,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) { diff --git a/sys/mips/rmi/xls_ehci.c b/sys/mips/rmi/xls_ehci.c index 5172993..0fc9a32 100644 --- a/sys/mips/rmi/xls_ehci.c +++ b/sys/mips/rmi/xls_ehci.c @@ -220,7 +220,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) { |
