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
/
act2000
/
act2000_isa.c
diff --git
a/drivers/isdn/act2000/act2000_isa.c
b/drivers/isdn/act2000/act2000_isa.c
index
df7923c
..
b363d09
100644
(file)
--- a/
drivers/isdn/act2000/act2000_isa.c
+++ b/
drivers/isdn/act2000/act2000_isa.c
@@
-18,6
+18,13
@@
static act2000_card *irq2card_map[16];
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:
/*
* Reset Controller, then try to read the Card's signature.
+ Return:
@@
-412,7
+419,7
@@
act2000_isa_download(act2000_card * card, act2000_ddef __user * cb)
if (!act2000_isa_reset(card->port))
return -ENXIO;
if (!act2000_isa_reset(card->port))
return -ENXIO;
-
msleep_interruptible(500
);
+
act2000_isa_delay(HZ / 2
);
if(copy_from_user(&cblock, cb, sizeof(cblock)))
return -EFAULT;
length = cblock.length;
if(copy_from_user(&cblock, cb, sizeof(cblock)))
return -EFAULT;
length = cblock.length;
@@
-445,6
+452,6
@@
act2000_isa_download(act2000_card * card, act2000_ddef __user * cb)
p += l;
}
kfree(buf);
p += l;
}
kfree(buf);
-
msleep_interruptible(500
);
+
act2000_isa_delay(HZ / 2
);
return (act2000_isa_getid(card));
}
return (act2000_isa_getid(card));
}