Author: thompsa
Date: Sun Nov 8 20:44:55 2009
New Revision: 199057
URL: http://svn.freebsd.org/changeset/base/199057
Log:
ehci_init() will do reset and set the usbrev flag. Fix problem where
ehci_reset() was called before ehci_init().
PR: usb/140242
Submitted by: Sebastian Huber
Modified:
head/sys/dev/usb/controller/ehci_ixp4xx.c
head/sys/dev/usb/controller/ehci_mbus.c
head/sys/dev/usb/controller/ehci_pci.c
Modified: head/sys/dev/usb/controller/ehci_ixp4xx.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_ixp4xx.c Sun Nov 8 20:17:15 2009
(r199056)
+++ head/sys/dev/usb/controller/ehci_ixp4xx.c Sun Nov 8 20:44:55 2009
(r199057)
@@ -157,8 +157,6 @@ ehci_ixp_attach(device_t self)
return (ENOMEM);
}
- sc->sc_bus.usbrev = USB_REV_2_0;
-
/* NB: hints fix the memory location and irq */
rid = 0;
@@ -230,7 +228,6 @@ ehci_ixp_attach(device_t self)
| EHCI_SCFLG_BIGEMMIO
| EHCI_SCFLG_NORESTERM
;
- (void) ehci_reset(sc);
err = ehci_init(sc);
if (!err) {
Modified: head/sys/dev/usb/controller/ehci_mbus.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_mbus.c Sun Nov 8 20:17:15 2009
(r199056)
+++ head/sys/dev/usb/controller/ehci_mbus.c Sun Nov 8 20:44:55 2009
(r199057)
@@ -166,8 +166,6 @@ ehci_mbus_attach(device_t self)
return (ENOMEM);
}
- sc->sc_bus.usbrev = USB_REV_2_0;
-
rid = 0;
sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid,
RF_ACTIVE);
if (!sc->sc_io_res) {
Modified: head/sys/dev/usb/controller/ehci_pci.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_pci.c Sun Nov 8 20:17:15 2009
(r199056)
+++ head/sys/dev/usb/controller/ehci_pci.c Sun Nov 8 20:44:55 2009
(r199057)
@@ -318,13 +318,11 @@ ehci_pci_attach(device_t self)
device_printf(self, "pre-2.0 USB revision (ignored)\n");
/* fallthrough */
case PCI_USB_REV_2_0:
- sc->sc_bus.usbrev = USB_REV_2_0;
break;
default:
/* Quirk for Parallels Desktop 4.0 */
device_printf(self, "USB revision is unknown. Assuming
v2.0.\n");
- sc->sc_bus.usbrev = USB_REV_2_0;
- break;
+ break;
}
rid = PCI_CBMEM;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
