[kernel] fix thinko in 102-ehci_hcd_ignore_oc patch
authorFlorian Fainelli <florian@openwrt.org>
Wed, 18 Jan 2012 07:56:02 +0000 (07:56 +0000)
committerFlorian Fainelli <florian@openwrt.org>
Wed, 18 Jan 2012 07:56:02 +0000 (07:56 +0000)
SVN-Revision: 29773

target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch
target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch
target/linux/generic/patches-3.2/102-ehci_hcd_ignore_oc.patch

index f98d8ee..3718008 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;
  
                        /*
index 2da6139..a7eb07e 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;
  
                        /*
index d23a015..c94d718 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;
  
                        /*
index 4ab2678..2ce8dda 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;
  
                        /*