From 58accb3fa535b5426d838c442d4cf38d331d7bf3 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 2 Jun 2009 14:51:30 +0200 Subject: [PATCH] --- yaml --- r: 147072 b: refs/heads/master c: 77b0308a0778861111184e097533000f7a458c37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss_scsi.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 676481690eee..88dc807b74b6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fe063268e73681cdca1a6496a25f93d3332f517 +refs/heads/master: 77b0308a0778861111184e097533000f7a458c37 diff --git a/trunk/drivers/block/cciss_scsi.c b/trunk/drivers/block/cciss_scsi.c index 8575c48c8917..2edfc9b644eb 100644 --- a/trunk/drivers/block/cciss_scsi.c +++ b/trunk/drivers/block/cciss_scsi.c @@ -1608,8 +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. */ - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(waittime); + schedule_timeout_interruptible(waittime); count++; /* Increase wait time with each try, up to a point. */