From: David Brownell <david-b@pacbell.net>
Date: Fri, 6 Oct 2006 07:43:51 +0000 (-0700)
Subject: [PATCH] ohci: don't play with IRQ regs
X-Git-Tag: v2.6.19-rc2~307
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da66b719d16f6ea3801b859c1ff35d5cd05c517d;p=linux-2.6

[PATCH] ohci: don't play with IRQ regs

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>
---

diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index e08d1a2664..fe1fe2f97c 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -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;