From cb74014c215f1ee03f914fdcfae6e602d05ce021 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Tue, 3 May 2011 14:53:57 -0500 Subject: [PATCH] --- yaml --- r: 251188 b: refs/heads/master c: 93c46c2fa7cfb272c3014327830d6cb30d8486a4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3da62220acef..76665bbf4e3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5afe278114a8dd9480813377c75b5e40a42c5066 +refs/heads/master: 93c46c2fa7cfb272c3014327830d6cb30d8486a4 diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index 23b0ba49300a..7990b98d4f73 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/drivers/block/cciss.c @@ -4477,7 +4477,6 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev, */ dev_info(&pdev->dev, "using doorbell to reset controller\n"); writel(use_doorbell, vaddr + SA5_DOORBELL); - msleep(1000); } else { /* Try to do it the PCI power state way */ /* Quoting from the Open CISS Specification: "The Power @@ -4508,8 +4507,6 @@ static int cciss_controller_hard_reset(struct pci_dev *pdev, pmcsr &= ~PCI_PM_CTRL_STATE_MASK; pmcsr |= PCI_D0; pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); - - msleep(500); } return 0; }