fix thinko in 102-ehci_hcd_ignore_oc patch
[openwrt/openwrt.git] / target / linux / generic / patches-3.0 / 102-ehci_hcd_ignore_oc.patch
index 2da61397da4bb29ef04eb3ad92da6ecaa3c8f2a4..a7eb07e4cb3d86574aa9a9cf41d1cf408d74db86 100644 (file)
@@ -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;
  
                        /*