diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 13:32:20 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 13:32:20 -0700 |
| commit | cc6120c6687c34501c0b1d49b4d7e46c63911fed (patch) | |
| tree | a43eeb2ed68ba9ef544fe1f1dc108c8848ba0df9 /drivers/usb/host/uhci-hub.c | |
| parent | 7b799bc82b5eebb8937ff773e4c4be7260698627 (diff) | |
| parent | f5e09b7cac4a2705f55830db64d448c062e84e8e (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
Diffstat (limited to 'drivers/usb/host/uhci-hub.c')
| -rw-r--r-- | drivers/usb/host/uhci-hub.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/host/uhci-hub.c b/drivers/usb/host/uhci-hub.c index 4eace2b19dd..a71e48a6680 100644 --- a/drivers/usb/host/uhci-hub.c +++ b/drivers/usb/host/uhci-hub.c @@ -145,15 +145,16 @@ static int uhci_hub_status_data(struct usb_hcd *hcd, char *buf) { struct uhci_hcd *uhci = hcd_to_uhci(hcd); unsigned long flags; - int status; + int status = 0; spin_lock_irqsave(&uhci->lock, flags); - if (uhci->hc_inaccessible) { - status = 0; - goto done; - } + uhci_scan_schedule(uhci, NULL); + if (uhci->hc_inaccessible) + goto done; + check_fsbr(uhci); uhci_check_ports(uhci); + status = get_hub_status_data(uhci, buf); switch (uhci->rh_state) { |