summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-18 07:56:02 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-18 07:56:02 +0000
commit60e384d2762251611d312b4ef951a59d78facbe7 (patch)
tree176184806b02a525593507df35d94d91b6c1744a
parent1ca901eda3c1fb96b3a3d2a00fd396ee84a90dd9 (diff)
[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
-rw-r--r--target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch4
-rw-r--r--target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch4
-rw-r--r--target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch4
-rw-r--r--target/linux/generic/patches-3.2/102-ehci_hcd_ignore_oc.patch4
4 files changed, 8 insertions, 8 deletions
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 f98d8ee02..371800820 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 2da61397d..a7eb07e4c 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 d23a01509..c94d718af 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 4ab267854..2ce8ddaa1 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;
/*