git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
isdn
/
hysdn
/
boardergo.c
diff --git
a/drivers/isdn/hysdn/boardergo.c
b/drivers/isdn/hysdn/boardergo.c
index
e19a01a
..
2f27315
100644
(file)
--- a/
drivers/isdn/hysdn/boardergo.c
+++ b/
drivers/isdn/hysdn/boardergo.c
@@
-21,7
+21,6
@@
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/vmalloc.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/vmalloc.h>
-#include <linux/delay.h>
#include <asm/io.h>
#include "hysdn_defs.h"
#include <asm/io.h>
#include "hysdn_defs.h"
@@
-247,7
+246,8
@@
ergo_writebootimg(struct HYSDN_CARD *card, uchar * buf, ulong offs)
/* the interrupts are still masked */
sti();
/* the interrupts are still masked */
sti();
- msleep_interruptible(20); /* Timeout 20ms */
+ set_current_state(TASK_INTERRUPTIBLE);
+ schedule_timeout((20 * HZ) / 1000); /* Timeout 20ms */
if (((tDpramBootSpooler *) card->dpram)->Len != DPRAM_SPOOLER_DATA_SIZE) {
if (card->debug_flags & LOG_POF_CARD)
if (((tDpramBootSpooler *) card->dpram)->Len != DPRAM_SPOOLER_DATA_SIZE) {
if (card->debug_flags & LOG_POF_CARD)
@@
-386,7
+386,8
@@
ergo_waitpofready(struct HYSDN_CARD *card)
return (0); /* success */
} /* data has arrived */
sti();
return (0); /* success */
} /* data has arrived */
sti();
- msleep_interruptible(50); /* Timeout 50ms */
+ set_current_state(TASK_INTERRUPTIBLE);
+ schedule_timeout((50 * HZ) / 1000); /* Timeout 50ms */
} /* wait until timeout */
if (card->debug_flags & LOG_POF_CARD)
} /* wait until timeout */
if (card->debug_flags & LOG_POF_CARD)