aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2006-10-06 00:43:51 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-06 08:53:40 -0700
commitda66b719d16f6ea3801b859c1ff35d5cd05c517d (patch)
tree47c5fd1a4d9f9d6beb089b8129aea0f471e9930a /drivers/usb
parentefbc52f945696702a97a78b12812093f61880c2c (diff)
downloadkernel_samsung_aries-da66b719d16f6ea3801b859c1ff35d5cd05c517d.zip
kernel_samsung_aries-da66b719d16f6ea3801b859c1ff35d5cd05c517d.tar.gz
kernel_samsung_aries-da66b719d16f6ea3801b859c1ff35d5cd05c517d.tar.bz2
[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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/host/ohci-q.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index e08d1a2..fe1fe2f 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;