diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:08:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-08 10:08:57 -0700 |
| commit | 81d1ab82c045fd4d2f3c803147f0a1c6bd2015fc (patch) | |
| tree | a49ceefa240013fc1a91d7e3f4c308b51232972f /drivers/block/cciss.c | |
| parent | d3dea1e2d5b08964a8d47a29b4f6807a60d40f4c (diff) | |
| parent | 59247eaea50cc68cc6ce3d3fd3855f3301b65c96 (diff) | |
| download | linux-81d1ab82c045fd4d2f3c803147f0a1c6bd2015fc.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: fix missing bio back/front segment size setting in blk_recount_segments()
loop: don't increment p->offset with (size_t) -EINVAL
cciss: remove 30 second initial timeout on controller reset
Fix kernel NULL pointer dereference in xen-blkfront
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index b5a061114630..4f9b6d792017 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; |