From: Jiri Slaby <jirislaby@gmail.com>
Date: Thu, 7 Feb 2008 08:16:32 +0000 (-0800)
Subject: Char: rocket, switch long delay to sleep
X-Git-Tag: v2.6.25-rc1~324
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=48a67f5da1e605c0ec0534cb003ca0cd114f3d1b;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index d83419c3857..7a63f570e95 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)
 		num_chan = ports_per_aiop;
 		for (chan = 0; chan < num_chan; chan++)
 			sPCIModemReset(ctlp, chan, 1);
-		mdelay(500);
+		msleep(500);
 		for (chan = 0; chan < num_chan; chan++)
 			sPCIModemReset(ctlp, chan, 0);
-		mdelay(500);
+		msleep(500);
 		rmSpeakerReset(ctlp, rocketModel[i].model);
 	}
 	return (1);
@@ -2309,10 +2309,10 @@ static int __init init_ISA(int i)
 		total_num_chan = num_chan;
 		for (chan = 0; chan < num_chan; chan++)
 			sModemReset(ctlp, chan, 1);
-		mdelay(500);
+		msleep(500);
 		for (chan = 0; chan < num_chan; chan++)
 			sModemReset(ctlp, chan, 0);
-		mdelay(500);
+		msleep(500);
 		strcpy(rocketModel[i].modelString, "RocketModem ISA");
 	} else {
 		strcpy(rocketModel[i].modelString, "RocketPort ISA");