diff options
Diffstat (limited to 'drivers/usb/host/ehci-sched.c')
-rw-r--r-- | drivers/usb/host/ehci-sched.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c index 027df3de2dc9..3429b8a33c58 100644 --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c | |||
@@ -2299,7 +2299,7 @@ scan_periodic (struct ehci_hcd *ehci) | |||
2299 | * Touches as few pages as possible: cache-friendly. | 2299 | * Touches as few pages as possible: cache-friendly. |
2300 | */ | 2300 | */ |
2301 | now_uframe = ehci->next_uframe; | 2301 | now_uframe = ehci->next_uframe; |
2302 | if (ehci->rh_state == EHCI_RH_RUNNING) { | 2302 | if (ehci->rh_state >= EHCI_RH_RUNNING) { |
2303 | clock = ehci_read_frame_index(ehci); | 2303 | clock = ehci_read_frame_index(ehci); |
2304 | clock_frame = (clock >> 3) & (ehci->periodic_size - 1); | 2304 | clock_frame = (clock >> 3) & (ehci->periodic_size - 1); |
2305 | } else { | 2305 | } else { |
@@ -2334,7 +2334,7 @@ restart: | |||
2334 | union ehci_shadow temp; | 2334 | union ehci_shadow temp; |
2335 | int live; | 2335 | int live; |
2336 | 2336 | ||
2337 | live = (ehci->rh_state == EHCI_RH_RUNNING); | 2337 | live = (ehci->rh_state >= EHCI_RH_RUNNING); |
2338 | switch (hc32_to_cpu(ehci, type)) { | 2338 | switch (hc32_to_cpu(ehci, type)) { |
2339 | case Q_TYPE_QH: | 2339 | case Q_TYPE_QH: |
2340 | /* handle any completions */ | 2340 | /* handle any completions */ |
@@ -2459,7 +2459,7 @@ restart: | |||
2459 | * We can't advance our scan without collecting the ISO | 2459 | * We can't advance our scan without collecting the ISO |
2460 | * transfers that are still pending in this frame. | 2460 | * transfers that are still pending in this frame. |
2461 | */ | 2461 | */ |
2462 | if (incomplete && ehci->rh_state == EHCI_RH_RUNNING) { | 2462 | if (incomplete && ehci->rh_state >= EHCI_RH_RUNNING) { |
2463 | ehci->next_uframe = now_uframe; | 2463 | ehci->next_uframe = now_uframe; |
2464 | break; | 2464 | break; |
2465 | } | 2465 | } |
@@ -2475,7 +2475,7 @@ restart: | |||
2475 | if (now_uframe == clock) { | 2475 | if (now_uframe == clock) { |
2476 | unsigned now; | 2476 | unsigned now; |
2477 | 2477 | ||
2478 | if (ehci->rh_state != EHCI_RH_RUNNING | 2478 | if (ehci->rh_state < EHCI_RH_RUNNING |
2479 | || ehci->periodic_sched == 0) | 2479 | || ehci->periodic_sched == 0) |
2480 | break; | 2480 | break; |
2481 | ehci->next_uframe = now_uframe; | 2481 | ehci->next_uframe = now_uframe; |