X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fchar%2Frio%2Frio_linux.c;h=0cc02371a845f57c612c78a2ac432ea7bcf09d3d;hb=3ec04f3d2903fdf6d9849a8633af59b8628164a5;hp=aa23b1cba7c975f255a887cd021bfc13253dcda9;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c
index aa23b1cba..0cc02371a 100644
--- a/drivers/char/rio/rio_linux.c
+++ b/drivers/char/rio/rio_linux.c
@@ -236,9 +236,9 @@ long rio_irqmask = -1;
 MODULE_AUTHOR("Rogier Wolff <R.E.Wolff@bitwizard.nl>, Patrick van de Lageweg <patrick@bitwizard.nl>");
 MODULE_DESCRIPTION("RIO driver");
 MODULE_LICENSE("GPL");
-module_param(rio_poll, int, 0);
-module_param(rio_debug, int, 0644);
-module_param(rio_irqmask, long, 0);
+MODULE_PARM(rio_poll, "i");
+MODULE_PARM(rio_debug, "i");
+MODULE_PARM(rio_irqmask, "i");
 
 static struct real_driver rio_real_driver = {
   rio_disable_tx_interrupts,
@@ -330,7 +330,8 @@ int RIODelay (struct Port *PortP, int njiffies)
   func_enter ();
 
   rio_dprintk (RIO_DEBUG_DELAY, "delaying %d jiffies\n", njiffies);  
-  msleep_interruptible(jiffies_to_msecs(njiffies));
+  current->state = TASK_INTERRUPTIBLE;
+  schedule_timeout(njiffies);
   func_exit();
 
   if (signal_pending(current))
@@ -346,7 +347,8 @@ int RIODelay_ni (struct Port *PortP, int njiffies)
   func_enter ();
 
   rio_dprintk (RIO_DEBUG_DELAY, "delaying %d jiffies (ni)\n", njiffies);  
-  msleep(jiffies_to_msecs(njiffies));
+  current->state = TASK_UNINTERRUPTIBLE;
+  schedule_timeout(njiffies);
   func_exit();
   return !RIO_FAIL;
 }