git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
usb
/
host
/
ehci-hub.c
diff --git
a/drivers/usb/host/ehci-hub.c
b/drivers/usb/host/ehci-hub.c
index
d03e3ca
..
69b0b9b
100644
(file)
--- a/
drivers/usb/host/ehci-hub.c
+++ b/
drivers/usb/host/ehci-hub.c
@@
-359,8
+359,6
@@
static int ehci_hub_control (
case USB_PORT_FEAT_SUSPEND:
if (temp & PORT_RESET)
goto error;
case USB_PORT_FEAT_SUSPEND:
if (temp & PORT_RESET)
goto error;
- if (ehci->no_selective_suspend)
- break;
if (temp & PORT_SUSPEND) {
if ((temp & PORT_PE) == 0)
goto error;
if (temp & PORT_SUSPEND) {
if ((temp & PORT_PE) == 0)
goto error;
@@
-516,8
+514,6
@@
static int ehci_hub_control (
temp &= ~PORT_RWC_BITS;
switch (wValue) {
case USB_PORT_FEAT_SUSPEND:
temp &= ~PORT_RWC_BITS;
switch (wValue) {
case USB_PORT_FEAT_SUSPEND:
- if (ehci->no_selective_suspend)
- break;
if ((temp & PORT_PE) == 0
|| (temp & PORT_RESET) != 0)
goto error;
if ((temp & PORT_PE) == 0
|| (temp & PORT_RESET) != 0)
goto error;