|
@@ -7438,19 +7438,22 @@ static int hpsa_request_irqs(struct ctlr_info *h,
|
|
|
|
|
|
static int hpsa_kdump_soft_reset(struct ctlr_info *h)
|
|
static int hpsa_kdump_soft_reset(struct ctlr_info *h)
|
|
{
|
|
{
|
|
|
|
+ int rc;
|
|
hpsa_send_host_reset(h, RAID_CTLR_LUNID, HPSA_RESET_TYPE_CONTROLLER);
|
|
hpsa_send_host_reset(h, RAID_CTLR_LUNID, HPSA_RESET_TYPE_CONTROLLER);
|
|
|
|
|
|
dev_info(&h->pdev->dev, "Waiting for board to soft reset.\n");
|
|
dev_info(&h->pdev->dev, "Waiting for board to soft reset.\n");
|
|
- if (hpsa_wait_for_board_state(h->pdev, h->vaddr, BOARD_NOT_READY)) {
|
|
|
|
|
|
+ rc = hpsa_wait_for_board_state(h->pdev, h->vaddr, BOARD_NOT_READY);
|
|
|
|
+ if (rc) {
|
|
dev_warn(&h->pdev->dev, "Soft reset had no effect.\n");
|
|
dev_warn(&h->pdev->dev, "Soft reset had no effect.\n");
|
|
- return -1;
|
|
|
|
|
|
+ return rc;
|
|
}
|
|
}
|
|
|
|
|
|
dev_info(&h->pdev->dev, "Board reset, awaiting READY status.\n");
|
|
dev_info(&h->pdev->dev, "Board reset, awaiting READY status.\n");
|
|
- if (hpsa_wait_for_board_state(h->pdev, h->vaddr, BOARD_READY)) {
|
|
|
|
|
|
+ rc = hpsa_wait_for_board_state(h->pdev, h->vaddr, BOARD_READY);
|
|
|
|
+ if (rc) {
|
|
dev_warn(&h->pdev->dev, "Board failed to become ready "
|
|
dev_warn(&h->pdev->dev, "Board failed to become ready "
|
|
"after soft reset.\n");
|
|
"after soft reset.\n");
|
|
- return -1;
|
|
|
|
|
|
+ return rc;
|
|
}
|
|
}
|
|
|
|
|
|
return 0;
|
|
return 0;
|