diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 06:18:25 +0100 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 06:18:25 +0100 |
| commit | a9931a6e37c09f6b76a9fa0cbd777c335548692b (patch) | |
| tree | cd6ba9d36e350dd6188f7b8f95efc59c85d34485 /drivers/ieee1394 | |
| parent | Remove amdtp, cmp drivers. (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-a9931a6e37c09f6b76a9fa0cbd777c335548692b.tar.xz linux-a9931a6e37c09f6b76a9fa0cbd777c335548692b.zip | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/amdtp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ieee1394/amdtp.c b/drivers/ieee1394/amdtp.c index e8e28569a668..75897509c401 100644 --- a/drivers/ieee1394/amdtp.c +++ b/drivers/ieee1394/amdtp.c @@ -320,8 +320,7 @@ static void ohci1394_stop_it_ctx(struct ti_ohci *ohci, int ctx, int synchronous) if ((control & OHCI1394_CONTEXT_ACTIVE) == 0) break; - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(1); + schedule_timeout_interruptible(1); } } } |