d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ehci_init() will do reset and set the usbrev flag. Fix problem where

Browse Source 
ehci_reset() was called before ehci_init().

PR:		usb/140242
Submitted by:	Sebastian Huber
This commit is contained in:
thompsa 2009-11-08 20:44:55 +00:00
parent aded7665d8
commit 410f2a9fd7
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/usb/controller/ehci_ixp4xx.c
View File

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

2
sys/dev/usb/controller/ehci_mbus.c
View File

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

4
sys/dev/usb/controller/ehci_pci.c
View File

@ -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;