diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/ieee1394/amdtp.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/ieee1394/amdtp.c')
| -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) | |||
| 320 | if ((control & OHCI1394_CONTEXT_ACTIVE) == 0) | 320 | if ((control & OHCI1394_CONTEXT_ACTIVE) == 0) |
| 321 | break; | 321 | break; |
| 322 | 322 | ||
| 323 | set_current_state(TASK_INTERRUPTIBLE); | 323 | schedule_timeout_interruptible(1); |
| 324 | schedule_timeout(1); | ||
| 325 | } | 324 | } |
| 326 | } | 325 | } |
| 327 | } | 326 | } |