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/isdn/icn/icn.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/isdn/icn/icn.c')
| -rw-r--r-- | drivers/isdn/icn/icn.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c index 386df71eee74..6649f8bc9951 100644 --- a/drivers/isdn/icn/icn.c +++ b/drivers/isdn/icn/icn.c | |||
| @@ -947,8 +947,7 @@ icn_loadproto(u_char __user * buffer, icn_card * card) | |||
| 947 | icn_maprelease_channel(card, 0); | 947 | icn_maprelease_channel(card, 0); |
| 948 | return -EIO; | 948 | return -EIO; |
| 949 | } | 949 | } |
| 950 | set_current_state(TASK_INTERRUPTIBLE); | 950 | schedule_timeout_interruptible(10); |
| 951 | schedule_timeout(10); | ||
| 952 | } | 951 | } |
| 953 | } | 952 | } |
| 954 | writeb(0x20, &sbuf_n); | 953 | writeb(0x20, &sbuf_n); |