X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fgeneric%2Fpatches-3.0%2F102-ehci_hcd_ignore_oc.patch;h=a7eb07e4cb3d86574aa9a9cf41d1cf408d74db86;hb=dbfeb5d1580f3fea00b3ced6291180ef95a922c0;hp=2da61397da4bb29ef04eb3ad92da6ecaa3c8f2a4;hpb=989c73848f2d643bbf47df00230e7012b77f182a;p=openwrt%2Fopenwrt.git

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 2da61397da..a7eb07e4cb 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
@@ -16,7 +16,7 @@
  	 * PORT_POWER; that's surprising, but maybe within-spec.
  	 */
 -	if (!ignore_oc)
-+	if (!ignore_oc || !ehci->ignore_oc)
++	if (!ignore_oc && !ehci->ignore_oc)
  		mask = PORT_CSC | PORT_PEC | PORT_OCC;
  	else
  		mask = PORT_CSC | PORT_PEC;
@@ -25,7 +25,7 @@
  			status |= USB_PORT_STAT_C_ENABLE << 16;
  
 -		if ((temp & PORT_OCC) && !ignore_oc){
-+		if ((temp & PORT_OCC) && (!ignore_oc || !ehci->ignore_oc)){
++		if ((temp & PORT_OCC) && (!ignore_oc && !ehci->ignore_oc)){
  			status |= USB_PORT_STAT_C_OVERCURRENT << 16;
  
  			/*