projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add apply_to_page_range() which applies a function to a pte range
[powerpc.git]
/
drivers
/
usb
/
host
/
uhci-hub.c
diff --git
a/drivers/usb/host/uhci-hub.c
b/drivers/usb/host/uhci-hub.c
index
bacc25c
..
8e4427a
100644
(file)
--- a/
drivers/usb/host/uhci-hub.c
+++ b/
drivers/usb/host/uhci-hub.c
@@
-33,6
+33,9
@@
static __u8 root_hub_hub_des[] =
/* status change bits: nonzero writes will clear */
#define RWC_BITS (USBPORTSC_OCC | USBPORTSC_PEC | USBPORTSC_CSC)
/* status change bits: nonzero writes will clear */
#define RWC_BITS (USBPORTSC_OCC | USBPORTSC_PEC | USBPORTSC_CSC)
+/* suspend/resume bits: port suspended or port resuming */
+#define SUSPEND_BITS (USBPORTSC_SUSP | USBPORTSC_RD)
+
/* A port that either is connected or has a changed-bit set will prevent
* us from AUTO_STOPPING.
*/
/* A port that either is connected or has a changed-bit set will prevent
* us from AUTO_STOPPING.
*/
@@
-96,8
+99,8
@@
static void uhci_finish_suspend(struct uhci_hcd *uhci, int port,
int status;
int i;
int status;
int i;
- if (inw(port_addr) &
(USBPORTSC_SUSP | USBPORTSC_RD)
) {
- CLR_RH_PORTSTAT(
USBPORTSC_SUSP | USBPORTSC_RD
);
+ if (inw(port_addr) &
SUSPEND_BITS
) {
+ CLR_RH_PORTSTAT(
SUSPEND_BITS
);
if (test_bit(port, &uhci->resuming_ports))
set_bit(port, &uhci->port_c_suspend);
if (test_bit(port, &uhci->resuming_ports))
set_bit(port, &uhci->port_c_suspend);
@@
-107,7
+110,7
@@
static void uhci_finish_suspend(struct uhci_hcd *uhci, int port,
* Experiments show that some controllers take longer, so
* we'll poll for completion. */
for (i = 0; i < 10; ++i) {
* Experiments show that some controllers take longer, so
* we'll poll for completion. */
for (i = 0; i < 10; ++i) {
- if (!(inw(port_addr) &
USBPORTSC_RD
))
+ if (!(inw(port_addr) &
SUSPEND_BITS
))
break;
udelay(1);
}
break;
udelay(1);
}
@@
-289,7
+292,7
@@
static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
wPortStatus |= USB_PORT_STAT_CONNECTION;
if (status & USBPORTSC_PE) {
wPortStatus |= USB_PORT_STAT_ENABLE;
wPortStatus |= USB_PORT_STAT_CONNECTION;
if (status & USBPORTSC_PE) {
wPortStatus |= USB_PORT_STAT_ENABLE;
- if (status &
(USBPORTSC_SUSP | USBPORTSC_RD)
)
+ if (status &
SUSPEND_BITS
)
wPortStatus |= USB_PORT_STAT_SUSPEND;
}
if (status & USBPORTSC_OC)
wPortStatus |= USB_PORT_STAT_SUSPEND;
}
if (status & USBPORTSC_OC)