Skip to content

Commit

Permalink
cciss: remove 30 second initial timeout on controller reset
Browse files Browse the repository at this point in the history
Commit 5e4c91c 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>
  • Loading branch information
Jens Axboe committed Mar 5, 2009
1 parent a1a15ac commit 5e18cfd
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/block/cciss.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 5e18cfd

Please sign in to comment.