---

yaml --- r: 132026 b: refs/heads/master c: 5e18cfd h: refs/heads/master v: v3
git-mirror · Mar 5, 2009 · 5e1ad52 · 5e1ad52
1 parent 0bf1a15
commit 5e1ad52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git 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
@@ -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;