From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 18 Jan 2012 07:56:02 +0000 (+0000)
Subject: [kernel] fix thinko in 102-ehci_hcd_ignore_oc patch
X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=60e384d2762251611d312b4ef951a59d78facbe7

[kernel] fix thinko in 102-ehci_hcd_ignore_oc patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29773 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch
index f98d8ee02f..371800820d 100644
--- a/target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-2.6.39/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;
  
  			/*
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;
  
  			/*
diff --git a/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch
index d23a015091..c94d718af3 100644
--- a/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-3.1/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;
  
  			/*
diff --git a/target/linux/generic/patches-3.2/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.2/102-ehci_hcd_ignore_oc.patch
index 4ab267854b..2ce8ddaa1c 100644
--- a/target/linux/generic/patches-3.2/102-ehci_hcd_ignore_oc.patch
+++ b/target/linux/generic/patches-3.2/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;
  
  			/*