From 5e1ad52c1e6410e32ae924fb38c97f6c8c6ebfe4 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 27 Feb 2009 08:10:26 +0100 Subject: [PATCH] --- yaml --- r: 132026 b: refs/heads/master c: 5e18cfd04feca78cc08a6b8b71a60a610de81eaa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3caefd2263ff..3849f19a8784 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1a15ac5f9aeee521c048a88fc1aec848e623de7 +refs/heads/master: 5e18cfd04feca78cc08a6b8b71a60a610de81eaa diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index b5a061114630..4f9b6d792017 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/drivers/block/cciss.c @@ -3606,11 +3606,9 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, if (cciss_hard_reset_controller(pdev) || cciss_reset_msi(pdev)) return -ENODEV; - /* Some devices (notably the HP Smart Array 5i Controller) - need a little pause here */ - schedule_timeout_uninterruptible(30*HZ); - - /* Now try to get the controller to respond to a no-op */ + /* Now try to get the controller to respond to a no-op. Some + devices (notably the HP Smart Array 5i Controller) need + up to 30 seconds to respond. */ for (i=0; i<30; i++) { if (cciss_noop(pdev) == 0) break;