diff options
author | David Brownell <david-b@pacbell.net> | 2006-10-06 03:43:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 11:53:40 -0400 |
commit | da66b719d16f6ea3801b859c1ff35d5cd05c517d (patch) | |
tree | 47c5fd1a4d9f9d6beb089b8129aea0f471e9930a /drivers/usb | |
parent | efbc52f945696702a97a78b12812093f61880c2c (diff) |
[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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c index e08d1a2664e6..fe1fe2f97cb5 100644 --- a/drivers/usb/host/ohci-q.c +++ b/drivers/usb/host/ohci-q.c | |||
@@ -925,7 +925,7 @@ rescan_all: | |||
925 | /* only take off EDs that the HC isn't using, accounting for | 925 | /* only take off EDs that the HC isn't using, accounting for |
926 | * frame counter wraps and EDs with partially retired TDs | 926 | * frame counter wraps and EDs with partially retired TDs |
927 | */ | 927 | */ |
928 | if (likely (get_irq_regs() && HC_IS_RUNNING(ohci_to_hcd(ohci)->state))) { | 928 | if (likely (HC_IS_RUNNING(ohci_to_hcd(ohci)->state))) { |
929 | if (tick_before (tick, ed->tick)) { | 929 | if (tick_before (tick, ed->tick)) { |
930 | skip_ed: | 930 | skip_ed: |
931 | last = &ed->ed_next; | 931 | last = &ed->ed_next; |