From c962c031c4760bbf483be8a636b51c7be7622b50 Mon Sep 17 00:00:00 2001 From: Robert Elliott Date: Fri, 6 Nov 2015 05:47:44 -0800 Subject: [PATCH] hpsa: skip free_irq calls if irqs are not allocated If try_soft_reset fails to re-allocate irqs, the error exit starts with free_irq calls, which generate kernel WARN messages since they were already freed a few lines earlier. Jump to the next exit label to skip the free_irq calls. Reviewed-by: Scott Teel Reviewed-by: Kevin Barnett Signed-off-by: Robert Elliott Signed-off-by: Don Brace Orabug: 22075051 Acked-by: Chuck Anderson --- drivers/scsi/hpsa.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 83f91c50b015..c5fbee7a48fc 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -7758,7 +7758,12 @@ reinit_after_soft_reset: if (rc) { dev_warn(&h->pdev->dev, "Failed to request_irq after soft reset.\n"); - goto clean4; + /* + * 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. + */ + goto clean3; } rc = hpsa_kdump_soft_reset(h); -- 2.50.1