aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-11-19 18:39:12 +0000
committerJonas Gorski <jogo@openwrt.org>2011-11-19 18:39:12 +0000
commit16fd48e131c7085f7e44527c007788e05da80476 (patch)
tree39e2cbceebad180ff668e938e073b12dae8f0ecc /target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
parent96285ef8bd36201c0187e8fd867c393b6c5a17d8 (diff)
downloadmaster-187ad058-16fd48e131c7085f7e44527c007788e05da80476.tar.gz
master-187ad058-16fd48e131c7085f7e44527c007788e05da80476.tar.bz2
master-187ad058-16fd48e131c7085f7e44527c007788e05da80476.zip
linux: update 3.0 to 3.0.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29264 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch')
-rw-r--r--target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
index 79e26b32db..2da61397da 100644
--- a/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
@@ -11,7 +11,7 @@
&ehci->regs->intr_enable); /* Turn On Interrupts */
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
-@@ -656,7 +656,7 @@ ehci_hub_status_data (struct usb_hcd *hc
+@@ -655,7 +655,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.
*/
@@ -20,7 +20,7 @@
mask = PORT_CSC | PORT_PEC | PORT_OCC;
else
mask = PORT_CSC | PORT_PEC;
-@@ -881,7 +881,7 @@ static int ehci_hub_control (
+@@ -880,7 +880,7 @@ static int ehci_hub_control (
if (temp & PORT_PEC)
status |= USB_PORT_STAT_C_ENABLE << 16;
@@ -31,10 +31,10 @@
/*
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
-@@ -137,6 +137,7 @@ struct ehci_hcd { /* one per controlle
- unsigned fs_i_thresh:1; /* Intel iso scheduling */
+@@ -138,6 +138,7 @@ struct ehci_hcd { /* one per controlle
unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/
unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
+ unsigned frame_index_bug:1; /* MosChip (AKA NetMos) */
+ unsigned ignore_oc:1;
/* required for usb32 quirk */