From 25f6941ec5cd461fa3fc015825edaaeb5e8fb1cc Mon Sep 17 00:00:00 2001 From: Alexandre Bounine Date: Wed, 10 Oct 2012 15:53:58 -0700 Subject: [PATCH] --- yaml --- r: 333268 b: refs/heads/master c: f4c9c0e83bdfab6d3de7bc9ad728d99bf6adde92 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/rapidio/rio-scan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a689daec3f8d..e2dd7ffa18c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 627260595ca6abcb16d68a3732bac6b547e112d6 +refs/heads/master: f4c9c0e83bdfab6d3de7bc9ad728d99bf6adde92 diff --git a/trunk/drivers/rapidio/rio-scan.c b/trunk/drivers/rapidio/rio-scan.c index 48e9041dd1e2..05f0ed9f8b1e 100644 --- a/trunk/drivers/rapidio/rio-scan.c +++ b/trunk/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",