ramips: rt288x: nuke built-in MTD partition maps

[openwrt.git] / target / linux / generic / patches-3.0 / 102-ehci_hcd_ignore_oc.patch

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 2da6139..a7eb07e 100644 (file)
--- 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)
         * 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;
                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){
                        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;
  
                        /*
                        status |= USB_PORT_STAT_C_OVERCURRENT << 16;
  
                        /*