From: Robert Elliott Date: Fri, 6 Nov 2015 13:47:44 +0000 (-0800) Subject: hpsa: fix try_soft_reset error handling X-Git-Tag: v4.1.12-92~189^2~20 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7cf23fcb2cb27ee4e96a1f4d33c797166d0086e2;p=users%2Fjedix%2Flinux-maple.git hpsa: fix try_soft_reset error handling If registering the special interrupt handlers in hpsa_init_one before a soft reset fails, the error exit needs to deallocate everything that was allocated before. Reviewed-by: Scott Teel Reviewed-by: Kevin Barnett Signed-off-by: Robert Elliott Signed-off-by: Don Brace Orabug: 22075051 Acked-by: Chuck Anderson --- diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index d2d3a43f85eb1..e685b8646f4b0 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -7769,9 +7769,15 @@ reinit_after_soft_reset: dev_warn(&h->pdev->dev, "Failed to request_irq after soft reset.\n"); /* - * clean4 starts with free_irqs, but that was just - * done. Then, request_irqs_failed, so there is - * nothing to free. So, goto the next label. + * cannot goto clean7 or free_irqs will be called + * again. Instead, do its work + */ + hpsa_free_performant_mode(h); /* clean7 */ + hpsa_free_sg_chain_blocks(h); /* clean6 */ + hpsa_free_cmd_pool(h); /* clean5 */ + /* + * skip hpsa_free_irqs(h) clean4 since that + * was just called before request_irqs failed */ goto clean3; } @@ -7779,7 +7785,7 @@ reinit_after_soft_reset: rc = hpsa_kdump_soft_reset(h); if (rc) /* Neither hard nor soft reset worked, we're hosed. */ - goto clean4; + goto clean7; dev_info(&h->pdev->dev, "Board READY.\n"); dev_info(&h->pdev->dev, @@ -7800,7 +7806,7 @@ reinit_after_soft_reset: hpsa_undo_allocations_after_kdump_soft_reset(h); try_soft_reset = 0; if (rc) - /* don't go to clean4, we already unallocated */ + /* don't goto clean, we already unallocated */ return -ENODEV; goto reinit_after_soft_reset;