From d4fbb7098e1f6f0d405fc9b82a172e145b70090a Mon Sep 17 00:00:00 2001 From: "scameron@beardog.cca.cpqcorp.net" Date: Mon, 8 Jun 2009 15:59:38 -0500 Subject: [PATCH] --- yaml --- r: 147077 b: refs/heads/master c: 40df6ae4277a67e97aa0a8bd8e293fdbb00e5623 h: refs/heads/master i: 147075: 8c700a8425e17cf4de66d58389b598c92b045e82 v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss_scsi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6ee0cc291f29..21bbfae57ab4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbb66c4be020b01dc2f3d7c609ddb0e09d2c0af7 +refs/heads/master: 40df6ae4277a67e97aa0a8bd8e293fdbb00e5623 diff --git a/trunk/drivers/block/cciss_scsi.c b/trunk/drivers/block/cciss_scsi.c index 2edfc9b644eb..134fdf25d7f4 100644 --- a/trunk/drivers/block/cciss_scsi.c +++ b/trunk/drivers/block/cciss_scsi.c @@ -1608,7 +1608,7 @@ static int wait_for_device_to_become_ready(ctlr_info_t *h, /* Wait for a bit. do this first, because if we send * the TUR right away, the reset will just abort it. */ - schedule_timeout_interruptible(waittime); + schedule_timeout_uninterruptible(waittime); count++; /* Increase wait time with each try, up to a point. */