backport r21306 to backfire (#7274)
[openwrt-10.03/.git] / target / linux / brcm63xx / patches-2.6.32 / 260-no_ehci_over_current_check.patch
1 Index: linux-2.6.32.12/drivers/usb/host/ehci-hub.c
2 ===================================================================
3 --- linux-2.6.32.12.orig/drivers/usb/host/ehci-hub.c    2010-05-02 21:06:45.000000000 +0200
4 +++ linux-2.6.32.12/drivers/usb/host/ehci-hub.c 2010-05-02 21:07:08.000000000 +0200
5 @@ -741,11 +741,13 @@
6                          * power switching; they're allowed to just limit the
7                          * current.  khubd will turn the power back on.
8                          */
9 +#ifndef CONFIG_BCM63XX
10                         if (HCS_PPC (ehci->hcs_params)){
11                                 ehci_writel(ehci,
12                                         temp & ~(PORT_RWC_BITS | PORT_POWER),
13                                         status_reg);
14                         }
15 +#endif
16                 }
17  
18                 /* whoever resumes must GetPortStatus to complete it!! */