Commit 5e18cfd0 authored by Jens Axboe's avatar Jens Axboe
Browse files

cciss: remove 30 second initial timeout on controller reset 



Commit 5e4c91c8 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: default avatarJens Axboe <jens.axboe@oracle.com>
parent a1a15ac5

drivers/block/cciss.c

+3 −5
Original line number Diff line number Diff line
@@ -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;