[PATCH] ohci: don't play with IRQ regs
authorDavid Brownell <david-b@pacbell.net>
Fri, 6 Oct 2006 07:43:51 +0000 (00:43 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Oct 2006 15:53:40 +0000 (08:53 -0700)
This is a more correct fix for the way the ohci hcd was referencing pt_regs
in the unlink paths.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/usb/host/ohci-q.c

index e08d1a2664e61f1b5b2c75a92f757752e03dc1d8..fe1fe2f97cb5bbff22371cce9ca60dcf01842878 100644 (file)
@@ -925,7 +925,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 (get_irq_regs() && HC_IS_RUNNING(ohci_to_hcd(ohci)->state))) {
+               if (likely (HC_IS_RUNNING(ohci_to_hcd(ohci)->state))) {
                        if (tick_before (tick, ed->tick)) {
 skip_ed:
                                last = &ed->ed_next;