diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2005-04-09 17:27:32 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-27 17:43:43 -0400 |
commit | c8f4fe4358c5e0a79b4bd47b814d19f1d1d06f21 (patch) | |
tree | 0c12fec97ac524e77489d3e8460bd9bb4817c0d5 /drivers/usb/host/uhci-hub.c | |
parent | f5946f8220a866dcdb8edc6abe23c1443e252425 (diff) |
[PATCH] USB UHCI: Add root hub states
This patch starts making some serious changes to the UHCI driver.
There's a set of private states for the root hub, and the internal
routines for suspending and resuming work completely differently, with
transitions based on the new states. Now the driver distinguishes
between a privately auto-stopped state and a publicly suspended state,
and it will properly suspend controllers with broken resume-detect
interrupts instead of resetting them.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/uhci-hub.c')
-rw-r--r-- | drivers/usb/host/uhci-hub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c index ddb19cbf4b75..fc34fee2ab07 100644 --- a/drivers/usb/host/uhci-hub.c +++ b/drivers/usb/host/uhci-hub.c | |||
@@ -60,7 +60,7 @@ static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf) | |||
60 | test_bit(port, &uhci->port_c_suspend)) | 60 | test_bit(port, &uhci->port_c_suspend)) |
61 | *buf |= (1 << (port + 1)); | 61 | *buf |= (1 << (port + 1)); |
62 | } | 62 | } |
63 | if (*buf && uhci->state == UHCI_SUSPENDED) | 63 | if (*buf && uhci->is_stopped) |
64 | uhci->resume_detect = 1; | 64 | uhci->resume_detect = 1; |
65 | return !!*buf; | 65 | return !!*buf; |
66 | } | 66 | } |