Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[mv-sheeva.git] / drivers / isdn / sc / message.c

diff --git a/drivers/isdn/sc/message.c b/drivers/isdn/sc/message.c
index ca204da3257d3918ae150c30d8b08a2e92bd35db..0a0fe6b8039bbe8cea80b815a1526799c31c8376 100644 (file)
--- 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");