aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.0/102-ehci_hcd_ignore_oc.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2015-05-26 09:31:16 +0000
committerImre Kaloz <kaloz@openwrt.org>2015-05-26 09:31:16 +0000
commit588acc2cbae61c31b6eabd19e55fcb48c653d87a (patch)
treef26bf8a48afd178778540f4d077b203b902cb3e1 /target/linux/generic/patches-4.0/102-ehci_hcd_ignore_oc.patch
parentdf23709f165b2e74e398080f1c0706d011263412 (diff)
downloadupstream-588acc2cbae61c31b6eabd19e55fcb48c653d87a.tar.gz
upstream-588acc2cbae61c31b6eabd19e55fcb48c653d87a.tar.bz2
upstream-588acc2cbae61c31b6eabd19e55fcb48c653d87a.zip
generic/4.0: update to 4.0.4
Update kernel sources and refresh some patches. Signed-off-by: Daniel Golle <daniel@makrotopia.org> Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 45761
Diffstat (limited to 'target/linux/generic/patches-4.0/102-ehci_hcd_ignore_oc.patch')
-rw-r--r--target/linux/generic/patches-4.0/102-ehci_hcd_ignore_oc.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-4.0/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-4.0/102-ehci_hcd_ignore_oc.patch
index fbe7568578..4da579cedc 100644
--- a/target/linux/generic/patches-4.0/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-4.0/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
-@@ -630,7 +630,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+@@ -633,7 +633,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.
*/
@@ -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;
-@@ -992,7 +992,7 @@ int ehci_hub_control(
+@@ -995,7 +995,7 @@ int ehci_hub_control(
if (temp & PORT_PEC)
status |= USB_PORT_STAT_C_ENABLE << 16;