shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "USB: Fix EHCI bug if connect with FS or LS device."

Browse Source 
This reverts commit f65cb6fc5a.
This commit is contained in:
lyz
2014-12-10 15:40:21 +08:00
parent 4ccf4784af
commit 29badc3cbd
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/host/ehci-hub.c
View File

@@ -285,12 +285,6 @@ static int ehci_bus_suspend (struct usb_hcd *hcd)
t2 |= PORT_WKOC_E | PORT_WKCONN_E;
}
#ifdef CONFIG_USB_EHCI_RK
/* RK3288 do not support OHCI controller, so clear PORT_OWNER
* here, otherwise EHCI can't be used anymore. wlf@20140325 */
t2 &= ~PORT_OWNER;
#endif
if (t1 != t2) {
ehci_vdbg (ehci, "port %d, %08x -> %08x\n",
port + 1, t1, t2);
@@ -1059,12 +1053,6 @@ static int ehci_hub_control (
ehci_dbg (ehci,
"port %d low speed --> companion\n",
wIndex + 1);
#ifdef CONFIG_USB_EHCI_RK
/* RK3288 do not support OHCI controller, so can't set PORT_OWNER
* here, otherwise EHCI can't be used anymore. wlf@20140325 */
retval = -ENODEV;
break;
#endif
temp |= PORT_OWNER;
} else {
ehci_vdbg (ehci, "port %d reset\n", wIndex + 1);