diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-09 14:33:22 -0800 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-09 14:33:22 -0800 |
commit | e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b (patch) | |
tree | 69d5685ef0c194f651a03e30bff14628b4d45400 /drivers/isdn/sc/message.c | |
parent | ec58ef03284f0bfa50a04982b74c8c2325a0758e (diff) | |
parent | ad8f76be48d817b48222411ae16a7dfe257bdb24 (diff) | |
download | talos-op-linux-e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b.tar.gz talos-op-linux-e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/isdn/sc/message.c')
-rw-r--r-- | drivers/isdn/sc/message.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/sc/message.c b/drivers/isdn/sc/message.c index ca204da3257d..0a0fe6b8039b 100644 --- a/drivers/isdn/sc/message.c +++ b/drivers/isdn/sc/message.c @@ -208,8 +208,7 @@ int send_and_receive(int card, tries = 0; /* wait for the response */ while (tries < timeout) { - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(1); + schedule_timeout_interruptible(1); pr_debug("SAR waiting..\n"); |