Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

[~andy/linux] / drivers / usb / host / ohci-q.c

diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index 15dc51ded61a5460b3e253004827669be7bceebb..c5a1ea9145faec6e65809ddf1fdbb7046f6897cc 100644 (file)
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -912,7 +912,7 @@ rescan_all:
                /* only take off EDs that the HC isn't using, accounting for
                 * frame counter wraps and EDs with partially retired TDs
                 */
-               if (likely (HC_IS_RUNNING(ohci_to_hcd(ohci)->state))) {
+               if (likely(ohci->rh_state == OHCI_RH_RUNNING)) {
                        if (tick_before (tick, ed->tick)) {
 skip_ed:
                                last = &ed->ed_next;
@@ -1012,7 +1012,7 @@ rescan_this:
 
                /* but if there's work queued, reschedule */
                if (!list_empty (&ed->td_list)) {
-                       if (HC_IS_RUNNING(ohci_to_hcd(ohci)->state))
+                       if (ohci->rh_state == OHCI_RH_RUNNING)
                                ed_schedule (ohci, ed);
                }
 
@@ -1021,9 +1021,7 @@ rescan_this:
        }
 
        /* maybe reenable control and bulk lists */
-       if (HC_IS_RUNNING(ohci_to_hcd(ohci)->state)
-                       && ohci_to_hcd(ohci)->state != HC_STATE_QUIESCING
-                       && !ohci->ed_rm_list) {
+       if (ohci->rh_state == OHCI_RH_RUNNING && !ohci->ed_rm_list) {
                u32     command = 0, control = 0;
 
                if (ohci->ed_controltail) {