This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / isdn / sc / init.c

diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c
index a10c6af..930845c 100644 (file)
--- a/drivers/isdn/sc/init.c
+++ b/drivers/isdn/sc/init.c
@@ -7,7 +7,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/delay.h>
 #include "includes.h"
 #include "hardware.h"
 #include "card.h"
@@ -168,7 +167,8 @@ static int __init sc_init(void)
                if(do_reset) {
                        pr_debug("Doing a SAFE probe reset\n");
                        outb(0xFF, io[b] + RESET_OFFSET);
-                       msleep_interruptible(10000);
+                       set_current_state(TASK_INTERRUPTIBLE);
+                       schedule_timeout(milliseconds(10000));
                }
                pr_debug("RAM Base for board %d is 0x%x, %s probe\n", b, ram[b],
                        ram[b] == 0 ? "will" : "won't");
@@ -500,7 +500,8 @@ int identify_board(unsigned long rambase, unsigned int iobase)
         * Try to identify a PRI card
         */
        outb(PRI_BASEPG_VAL, pgport);
-       msleep_interruptible(1000);
+       set_current_state(TASK_INTERRUPTIBLE);
+       schedule_timeout(HZ);
        sig = readl(rambase + SIG_OFFSET);
        pr_debug("Looking for a signature, got 0x%x\n", sig);
        if(sig == SIGNATURE)
@@ -510,7 +511,8 @@ int identify_board(unsigned long rambase, unsigned int iobase)
         * Try to identify a PRI card
         */
        outb(BRI_BASEPG_VAL, pgport);
-       msleep_interruptible(1000);
+       set_current_state(TASK_INTERRUPTIBLE);
+       schedule_timeout(HZ);
        sig = readl(rambase + SIG_OFFSET);
        pr_debug("Looking for a signature, got 0x%x\n", sig);
        if(sig == SIGNATURE)