summaryrefslogtreecommitdiff
path: root/target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-09 12:19:49 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-08-09 12:19:49 +0000
commit4282cc86e6d27757e6d73d39d31792408f83f994 (patch)
tree6f5ab4634169162f3ae1ba60f82f84147d00d3b7 /target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch
parentb460d9e23fe468d9d59394ea86f631150006ff6c (diff)
bcm63xx: add support for linux 3.1-rc1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27941 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch b/target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch
new file mode 100644
index 0000000000..bb5d9e77f9
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.1/210-no_ehci_over_current_check.patch
@@ -0,0 +1,17 @@
+--- a/drivers/usb/host/ehci-hub.c
++++ b/drivers/usb/host/ehci-hub.c
+@@ -816,12 +816,14 @@ static int ehci_hub_control (
+ * power switching; they're allowed to just limit the
+ * current. khubd will turn the power back on.
+ */
++#ifndef CONFIG_BCM63XX
+ if ((temp & PORT_OC) && HCS_PPC(ehci->hcs_params)) {
+ ehci_writel(ehci,
+ temp & ~(PORT_RWC_BITS | PORT_POWER),
+ status_reg);
+ temp = ehci_readl(ehci, status_reg);
+ }
++#endif
+ }
+
+ /* whoever resumes must GetPortStatus to complete it!! */