diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-01-18 07:56:02 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-01-18 07:56:02 +0000 |
| commit | dbfeb5d1580f3fea00b3ced6291180ef95a922c0 (patch) | |
| tree | ea5693c7ffe6be8424b1e8cff33b329ce72b36ea /target/linux/generic | |
| parent | 989c73848f2d643bbf47df00230e7012b77f182a (diff) | |
| download | upstream-dbfeb5d1580f3fea00b3ced6291180ef95a922c0.tar.gz upstream-dbfeb5d1580f3fea00b3ced6291180ef95a922c0.tar.bz2 upstream-dbfeb5d1580f3fea00b3ced6291180ef95a922c0.zip | |
fix thinko in 102-ehci_hcd_ignore_oc patch
SVN-Revision: 29773
Diffstat (limited to 'target/linux/generic')
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 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; /* |