aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Bounine <alexandre.bounine@idt.com>2012-10-10 15:53:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-11 08:50:14 +0900
commitf4c9c0e83bdfab6d3de7bc9ad728d99bf6adde92 (patch)
treea553b1e1757023f64097d30e491958e394f0354e
parent627260595ca6abcb16d68a3732bac6b547e112d6 (diff)
downloadkernel_goldelico_gta04-f4c9c0e83bdfab6d3de7bc9ad728d99bf6adde92.zip
kernel_goldelico_gta04-f4c9c0e83bdfab6d3de7bc9ad728d99bf6adde92.tar.gz
kernel_goldelico_gta04-f4c9c0e83bdfab6d3de7bc9ad728d99bf6adde92.tar.bz2
rapidio: use msleep in discovery wait
Use msleep() for code clarity as suggested by Andrew Morton in his comments for the original patch: https://lkml.org/lkml/2012/10/3/546. Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Li Yang <leoli@freescale.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rapidio/rio-scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 48e9041..05f0ed9 100644
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -1391,7 +1391,7 @@ int __devinit rio_disc_mport(struct rio_mport *mport)
while (time_before(jiffies, to_end)) {
if (rio_enum_complete(mport))
goto enum_done;
- schedule_timeout_uninterruptible(msecs_to_jiffies(10));
+ msleep(10);
}
pr_debug("RIO: discovery timeout on mport %d %s\n",