Skip to contentSkip to conversation

isdn/act2000_isa: replace

PATCH New Nishanth Aravamudan 1 participant 1 message Sep 17, 2004 Kernel janitors

lore
Share & tools
lore

Nishanth Aravamudan

author
#0 lore raw

PATCH 1/15 isdn/act2000_isa: replace

Any comments would be appreciated. This is a re-push of a patch submitted a few months ago which has not been merged as of 2.6.9-rc1-mm5.

Description: Uses msleep_interruptible() in place of act2000_isa_delay() to guarantee the task delays as expected.

Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/isdn/act2000/act2000_isa.c +2 -9
@@ -18,13 +18,6 @@
 
 static act2000_card *irq2card_map[16];
 
-static void
-act2000_isa_delay(long t)
-{
-        set_current_state(TASK_INTERRUPTIBLE);
-        schedule_timeout(t);
-}
-
 /*
  * Reset Controller, then try to read the Card's signature.
  + Return:

@@ -419,7 +412,7 @@ act2000_isa_download(act2000_card * card
 
         if (!act2000_isa_reset(card->port))
                 return -ENXIO;
-        act2000_isa_delay(HZ / 2);
+        msleep_interruptible(500);
         if(copy_from_user(&cblock, cb, sizeof(cblock)))
         	return -EFAULT;
         length = cblock.length;

@@ -449,6 +442,6 @@ act2000_isa_download(act2000_card * card
                 p += l;
         }
         kfree(buf);
-        act2000_isa_delay(HZ / 2);
+        msleep_interruptible(500);
         return (act2000_isa_getid(card));
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors