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 <scott.teel@pmcs.com>
Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Hannes Reinecke <hare@Suse.de>
Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 1979b7e45c93904e354c19e51d4498399b4341f4..0b8b8808b94454a092672b16e003d9c16e250820 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -7770,9 +7770,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;
                }
@@ -7780,7 +7786,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,
@@ -7801,7 +7807,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;