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
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
usb
/
host
/
uhci-hub.c
diff --git
a/drivers/usb/host/uhci-hub.c
b/drivers/usb/host/uhci-hub.c
index
c545ef9
..
c8451d9
100644
(file)
--- a/
drivers/usb/host/uhci-hub.c
+++ b/
drivers/usb/host/uhci-hub.c
@@
-171,8
+171,9
@@
static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf)
spin_lock_irqsave(&uhci->lock, flags);
uhci_scan_schedule(uhci, NULL);
spin_lock_irqsave(&uhci->lock, flags);
uhci_scan_schedule(uhci, NULL);
- if (
!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags) || uhci->dead
)
+ if (
uhci->hc_inaccessible
)
goto done;
goto done;
+ check_fsbr(uhci);
uhci_check_ports(uhci);
status = get_hub_status_data(uhci, buf);
uhci_check_ports(uhci);
status = get_hub_status_data(uhci, buf);
@@
-227,7
+228,7
@@
static int uhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
u16 wPortChange, wPortStatus;
unsigned long flags;
u16 wPortChange, wPortStatus;
unsigned long flags;
- if (
!test_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags) || uhci->dead
)
+ if (
uhci->hc_inaccessible
)
return -ETIMEDOUT;
spin_lock_irqsave(&uhci->lock, flags);
return -ETIMEDOUT;
spin_lock_irqsave(&uhci->lock, flags);