Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39c53f55 authored by Robert Elliott's avatar Robert Elliott Committed by James Bottomley
Browse files

hpsa: propagate the error code in hpsa_kdump_soft_reset 



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: default avatarScott Teel <scott.teel@pmcs.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: default avatarHannes Reinecke <hare@Suse.de>
Signed-off-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarDon Brace <don.brace@pmcs.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 2946e82b

drivers/scsi/hpsa.c

+7 −4
Original line number Diff line number Diff line
@@ -7438,19 +7438,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;