[PATCH v4 39/43] hpsa: propagate the error code in hpsa_kdump_soft_reset

[Don Brace]

From: Robert Elliott <elli...@hp.com>

If hpsa_wait_for_board_state fails, hpsa_kdump_soft_reset
should propagate its return value (e.g., -ENODEV) rather
than just returning -1.

Reviewed-by: Scott Teel <scott.t...@pmcs.com>
Reviewed-by: Kevin Barnett <kevin.barn...@pmcs.com>
Signed-off-by: Robert Elliott <elli...@hp.com>
Signed-off-by: Don Brace <don.br...@pmcs.com>
---
 drivers/scsi/hpsa.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index f65333d..f36ab70 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -7458,19 +7458,22 @@ static int hpsa_request_irqs(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);
 
        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");
-               return -1;
+               return rc;
        }
 
        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 "
                        "after soft reset.\n");
-               return -1;
+               return rc;
        }
 
        return 0;

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html