diff options
-rw-r--r-- | drivers/scsi/hpsa.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 6fe77d0575ca..ca8ee9220db0 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c | |||
@@ -3217,7 +3217,6 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev, | |||
3217 | */ | 3217 | */ |
3218 | dev_info(&pdev->dev, "using doorbell to reset controller\n"); | 3218 | dev_info(&pdev->dev, "using doorbell to reset controller\n"); |
3219 | writel(use_doorbell, vaddr + SA5_DOORBELL); | 3219 | writel(use_doorbell, vaddr + SA5_DOORBELL); |
3220 | msleep(1000); | ||
3221 | } else { /* Try to do it the PCI power state way */ | 3220 | } else { /* Try to do it the PCI power state way */ |
3222 | 3221 | ||
3223 | /* Quoting from the Open CISS Specification: "The Power | 3222 | /* Quoting from the Open CISS Specification: "The Power |
@@ -3248,8 +3247,6 @@ static int hpsa_controller_hard_reset(struct pci_dev *pdev, | |||
3248 | pmcsr &= ~PCI_PM_CTRL_STATE_MASK; | 3247 | pmcsr &= ~PCI_PM_CTRL_STATE_MASK; |
3249 | pmcsr |= PCI_D0; | 3248 | pmcsr |= PCI_D0; |
3250 | pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); | 3249 | pci_write_config_word(pdev, pos + PCI_PM_CTRL, pmcsr); |
3251 | |||
3252 | msleep(500); | ||
3253 | } | 3250 | } |
3254 | return 0; | 3251 | return 0; |
3255 | } | 3252 | } |