aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-02-07 03:16:32 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:33 -0500
commit48a67f5da1e605c0ec0534cb003ca0cd114f3d1b (patch)
tree2df59deb21a5636d9070bb35f22fe2678b186b9d
parent48103c527b2fcf5ead13ef14b34eb8893eaec06a (diff)
Char: rocket, switch long delay to sleep
Don't busy wait for whole 1s when registering some rocket modems. Sleep instead since we are not in atomic. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/rocket.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index d83419c3857e..7a63f570e953 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -2191,10 +2191,10 @@ static __init int register_PCI(int i, struct pci_dev *dev)
2191 num_chan = ports_per_aiop; 2191 num_chan = ports_per_aiop;
2192 for (chan = 0; chan < num_chan; chan++) 2192 for (chan = 0; chan < num_chan; chan++)
2193 sPCIModemReset(ctlp, chan, 1); 2193 sPCIModemReset(ctlp, chan, 1);
2194 mdelay(500); 2194 msleep(500);
2195 for (chan = 0; chan < num_chan; chan++) 2195 for (chan = 0; chan < num_chan; chan++)
2196 sPCIModemReset(ctlp, chan, 0); 2196 sPCIModemReset(ctlp, chan, 0);
2197 mdelay(500); 2197 msleep(500);
2198 rmSpeakerReset(ctlp, rocketModel[i].model); 2198 rmSpeakerReset(ctlp, rocketModel[i].model);
2199 } 2199 }
2200 return (1); 2200 return (1);
@@ -2309,10 +2309,10 @@ static int __init init_ISA(int i)
2309 total_num_chan = num_chan; 2309 total_num_chan = num_chan;
2310 for (chan = 0; chan < num_chan; chan++) 2310 for (chan = 0; chan < num_chan; chan++)
2311 sModemReset(ctlp, chan, 1); 2311 sModemReset(ctlp, chan, 1);
2312 mdelay(500); 2312 msleep(500);
2313 for (chan = 0; chan < num_chan; chan++) 2313 for (chan = 0; chan < num_chan; chan++)
2314 sModemReset(ctlp, chan, 0); 2314 sModemReset(ctlp, chan, 0);
2315 mdelay(500); 2315 msleep(500);
2316 strcpy(rocketModel[i].modelString, "RocketModem ISA"); 2316 strcpy(rocketModel[i].modelString, "RocketModem ISA");
2317 } else { 2317 } else {
2318 strcpy(rocketModel[i].modelString, "RocketPort ISA"); 2318 strcpy(rocketModel[i].modelString, "RocketPort ISA");