projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.18 to 3.18.14
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
generic
/
patches-3.18
/
102-ehci_hcd_ignore_oc.patch
diff --git
a/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch
b/target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch
index f498d4eac600abdd6b3dd8efbe892ec64475f31f..a5645596f98646d108cf22e0eadcafe29d4063c9 100644
(file)
--- a/
target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch
+++ b/
target/linux/generic/patches-3.18/102-ehci_hcd_ignore_oc.patch
@@
-31,7
+31,7
@@
Signed-off-by: Florian Fainelli <florian@openwrt.org>
&ehci->regs->intr_enable); /* Turn On Interrupts */
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
&ehci->regs->intr_enable); /* Turn On Interrupts */
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
-@@ -63
2,7 +632
,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+@@ -63
5,7 +635
,7 @@ ehci_hub_status_data (struct usb_hcd *hc
* always set, seem to clear PORT_OCC and PORT_CSC when writing to
* PORT_POWER; that's surprising, but maybe within-spec.
*/
* always set, seem to clear PORT_OCC and PORT_CSC when writing to
* PORT_POWER; that's surprising, but maybe within-spec.
*/
@@
-40,7
+40,7
@@
Signed-off-by: Florian Fainelli <florian@openwrt.org>
mask = PORT_CSC | PORT_PEC | PORT_OCC;
else
mask = PORT_CSC | PORT_PEC;
mask = PORT_CSC | PORT_PEC | PORT_OCC;
else
mask = PORT_CSC | PORT_PEC;
-@@ -99
2,7 +992
,7 @@ int ehci_hub_control(
+@@ -99
5,7 +995
,7 @@ int ehci_hub_control(
if (temp & PORT_PEC)
status |= USB_PORT_STAT_C_ENABLE << 16;
if (temp & PORT_PEC)
status |= USB_PORT_STAT_C_ENABLE << 16;