From: Robert Elliott <elliott@hp.com>
Date: Fri, 6 Nov 2015 13:47:44 +0000 (-0800)
Subject: hpsa: skip free_irq calls if irqs are not allocated
X-Git-Tag: v4.1.12-92~189^2~22
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c962c031c4760bbf483be8a636b51c7be7622b50;p=users%2Fjedix%2Flinux-maple.git

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 <scott.teel@pmcs.com>
Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com>
Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>

Orabug: 22075051
Acked-by: Chuck Anderson <chuck.anderson@oracle.com>
---

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);