diff options
Diffstat (limited to 'drivers/block/cciss.c')
-rw-r--r-- | drivers/block/cciss.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 1a4dff09c541..3b557231e1d3 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -4586,11 +4586,11 @@ static __devinit int cciss_kdump_hard_reset_controller(struct pci_dev *pdev) | |||
4586 | msleep(CCISS_POST_RESET_PAUSE_MSECS); | 4586 | msleep(CCISS_POST_RESET_PAUSE_MSECS); |
4587 | 4587 | ||
4588 | /* Wait for board to become not ready, then ready. */ | 4588 | /* Wait for board to become not ready, then ready. */ |
4589 | dev_info(&pdev->dev, "Waiting for board to become ready.\n"); | 4589 | dev_info(&pdev->dev, "Waiting for board to reset.\n"); |
4590 | rc = cciss_wait_for_board_state(pdev, vaddr, BOARD_NOT_READY); | 4590 | rc = cciss_wait_for_board_state(pdev, vaddr, BOARD_NOT_READY); |
4591 | if (rc) /* Don't bail, might be E500, etc. which can't be reset */ | 4591 | if (rc) /* Don't bail, might be E500, etc. which can't be reset */ |
4592 | dev_warn(&pdev->dev, | 4592 | dev_warn(&pdev->dev, |
4593 | "failed waiting for board to become not ready\n"); | 4593 | "failed waiting for board to reset\n"); |
4594 | rc = cciss_wait_for_board_state(pdev, vaddr, BOARD_READY); | 4594 | rc = cciss_wait_for_board_state(pdev, vaddr, BOARD_READY); |
4595 | if (rc) { | 4595 | if (rc) { |
4596 | dev_warn(&pdev->dev, | 4596 | dev_warn(&pdev->dev, |
@@ -4641,6 +4641,7 @@ static __devinit int cciss_init_reset_devices(struct pci_dev *pdev) | |||
4641 | return -ENODEV; | 4641 | return -ENODEV; |
4642 | 4642 | ||
4643 | /* Now try to get the controller to respond to a no-op */ | 4643 | /* Now try to get the controller to respond to a no-op */ |
4644 | dev_warn(&pdev->dev, "Waiting for controller to respond to no-op\n"); | ||
4644 | for (i = 0; i < CCISS_POST_RESET_NOOP_RETRIES; i++) { | 4645 | for (i = 0; i < CCISS_POST_RESET_NOOP_RETRIES; i++) { |
4645 | if (cciss_noop(pdev) == 0) | 4646 | if (cciss_noop(pdev) == 0) |
4646 | break; | 4647 | break; |