svn commit: r200332 - stable/8/sys/dev/usb/controller

[Andrew Thompson]

Author: thompsa
Date: Wed Dec  9 22:41:11 2009
New Revision: 200332
URL: http://svn.freebsd.org/changeset/base/200332

Log:
  MFC r199718
  
   Actually disable interrupts in ehci_detach().

Modified:
  stable/8/sys/dev/usb/controller/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)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/usb/controller/ehci.c
==============================================================================
--- stable/8/sys/dev/usb/controller/ehci.c	Wed Dec  9 22:40:27 2009	(r200331)
+++ stable/8/sys/dev/usb/controller/ehci.c	Wed Dec  9 22:41:11 2009	(r200332)
@@ -528,7 +528,7 @@ ehci_detach(ehci_softc_t *sc)
 	usb_callout_stop(&sc->sc_tmo_pcd);
 	usb_callout_stop(&sc->sc_tmo_poll);
 
-	EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
+	EOWRITE4(sc, EHCI_USBINTR, 0);
 	USB_BUS_UNLOCK(&sc->sc_bus);
 
 	if (ehci_hcreset(sc)) {