summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-02-27 08:10:26 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-03-05 12:04:57 +0100
commit5e18cfd04feca78cc08a6b8b71a60a610de81eaa (patch)
treea63e4cc6cbdd18528e8f15152685b9861d320f16 /drivers/block
parenta1a15ac5f9aeee521c048a88fc1aec848e623de7 (diff)
downloadop-kernel-dev-5e18cfd04feca78cc08a6b8b71a60a610de81eaa.zip
op-kernel-dev-5e18cfd04feca78cc08a6b8b71a60a610de81eaa.tar.gz
cciss: remove 30 second initial timeout on controller reset
Commit 5e4c91c84b194b26cf592779e451f4b5be777cba forgot to remove the initial sleep, get rid of it. Thanks to Randy Dunlap <randy.dunlap@oracle.com> for spotting this error. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/cciss.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index b5a0611..4f9b6d7 100644
--- a/drivers/block/cciss.c
+++ b/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;
OpenPOWER on IntegriCloud