diff options
| author | Hans Petter Selasky <hselasky@FreeBSD.org> | 2011-04-12 07:49:11 +0000 |
|---|---|---|
| committer | Hans Petter Selasky <hselasky@FreeBSD.org> | 2011-04-12 07:49:11 +0000 |
| commit | b0a5e05f623f950ff8c81068ade3a2a9fb820544 (patch) | |
| tree | eded5b9ebdeef770437b545bc02c9b60ce5bc175 /sys/dev/usb/controller | |
| parent | efc6da705884f33ebb6307293ffcd50a5a0ae609 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb/controller')
| -rw-r--r-- | sys/dev/usb/controller/ehci_ixp4xx.c | 7 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_mv.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/controller/ehci_pci.c | 6 |
3 files changed, 1 insertions, 15 deletions
diff --git a/sys/dev/usb/controller/ehci_ixp4xx.c b/sys/dev/usb/controller/ehci_ixp4xx.c index 79e1ccc74bf4c..8ea133fb7c52f 100644 --- a/sys/dev/usb/controller/ehci_ixp4xx.c +++ b/sys/dev/usb/controller/ehci_ixp4xx.c @@ -259,13 +259,6 @@ ehci_ixp_detach(device_t self) /* during module unload there are lots of children leftover */ device_delete_all_children(self); - /* - * disable interrupts that might have been switched on in ehci_init - */ - if (sc->sc_io_res) { - EOWRITE4(sc, EHCI_USBINTR, 0); - } - if (sc->sc_irq_res && sc->sc_intr_hdl) { /* * only call ehci_detach() after ehci_init() diff --git a/sys/dev/usb/controller/ehci_mv.c b/sys/dev/usb/controller/ehci_mv.c index 2459ab9770312..bbfb6a7924c0d 100644 --- a/sys/dev/usb/controller/ehci_mv.c +++ b/sys/dev/usb/controller/ehci_mv.c @@ -292,10 +292,9 @@ mv_ehci_detach(device_t self) device_delete_all_children(self); /* - * disable interrupts that might have been switched on in ehci_init + * disable interrupts that might have been switched on in mv_ehci_attach */ if (sc->sc_io_res) { - 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 bd160e4c1dd62..6abb19348d016 100644 --- a/sys/dev/usb/controller/ehci_pci.c +++ b/sys/dev/usb/controller/ehci_pci.c @@ -502,12 +502,6 @@ ehci_pci_detach(device_t self) pci_disable_busmaster(self); - /* - * disable interrupts that might have been switched on in ehci_init - */ - if (sc->sc_io_res) { - EOWRITE4(sc, EHCI_USBINTR, 0); - } if (sc->sc_irq_res && sc->sc_intr_hdl) { /* * only call ehci_detach() after ehci_init() |