caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix thinko in 102-ehci_hcd_ignore_oc patch

Browse Source 
SVN-Revision: 29773
This commit is contained in:
Florian Fainelli 2012-01-18 07:56:02 +00:00
parent 989c73848f
commit dbfeb5d158
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/generic/patches-2.6.39/102-ehci_hcd_ignore_oc.patch
View File

@ -16,7 +16,7 @@
* PORT_POWER; that's surprising, but maybe within-spec. * PORT_POWER; that's surprising, but maybe within-spec.
*/ */
- if (!ignore_oc) - if (!ignore_oc)
+ if (!ignore_oc || !ehci->ignore_oc) + if (!ignore_oc && !ehci->ignore_oc)
mask = PORT_CSC | PORT_PEC | PORT_OCC; mask = PORT_CSC | PORT_PEC | PORT_OCC;
else else
mask = PORT_CSC | PORT_PEC; mask = PORT_CSC | PORT_PEC;
@ -25,7 +25,7 @@
status |= USB_PORT_STAT_C_ENABLE << 16; status |= USB_PORT_STAT_C_ENABLE << 16;
- if ((temp & PORT_OCC) && !ignore_oc){ - 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;
/* /*

4
target/linux/generic/patches-3.0/102-ehci_hcd_ignore_oc.patch
View File

@ -16,7 +16,7 @@
* PORT_POWER; that's surprising, but maybe within-spec. * PORT_POWER; that's surprising, but maybe within-spec.
*/ */
- if (!ignore_oc) - if (!ignore_oc)
+ if (!ignore_oc || !ehci->ignore_oc) + if (!ignore_oc && !ehci->ignore_oc)
mask = PORT_CSC | PORT_PEC | PORT_OCC; mask = PORT_CSC | PORT_PEC | PORT_OCC;
else else
mask = PORT_CSC | PORT_PEC; mask = PORT_CSC | PORT_PEC;
@ -25,7 +25,7 @@
status |= USB_PORT_STAT_C_ENABLE << 16; status |= USB_PORT_STAT_C_ENABLE << 16;
- if ((temp & PORT_OCC) && !ignore_oc){ - 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;
/* /*

4
target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch
View File

@ -16,7 +16,7 @@
* PORT_POWER; that's surprising, but maybe within-spec. * PORT_POWER; that's surprising, but maybe within-spec.
*/ */
- if (!ignore_oc) - if (!ignore_oc)
+ if (!ignore_oc || !ehci->ignore_oc) + if (!ignore_oc && !ehci->ignore_oc)
mask = PORT_CSC | PORT_PEC | PORT_OCC; mask = PORT_CSC | PORT_PEC | PORT_OCC;
else else
mask = PORT_CSC | PORT_PEC; mask = PORT_CSC | PORT_PEC;
@ -25,7 +25,7 @@
status |= USB_PORT_STAT_C_ENABLE << 16; status |= USB_PORT_STAT_C_ENABLE << 16;
- if ((temp & PORT_OCC) && !ignore_oc){ - 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;
/* /*

4
target/linux/generic/patches-3.2/102-ehci_hcd_ignore_oc.patch
View File

@ -16,7 +16,7 @@
* PORT_POWER; that's surprising, but maybe within-spec. * PORT_POWER; that's surprising, but maybe within-spec.
*/ */
- if (!ignore_oc) - if (!ignore_oc)
+ if (!ignore_oc || !ehci->ignore_oc) + if (!ignore_oc && !ehci->ignore_oc)
mask = PORT_CSC | PORT_PEC | PORT_OCC; mask = PORT_CSC | PORT_PEC | PORT_OCC;
else else
mask = PORT_CSC | PORT_PEC; mask = PORT_CSC | PORT_PEC;
@ -25,7 +25,7 @@
status |= USB_PORT_STAT_C_ENABLE << 16; status |= USB_PORT_STAT_C_ENABLE << 16;
- if ((temp & PORT_OCC) && !ignore_oc){ - 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;
/* /*