diff options
| author | Robert Elliott <elliott@hp.com> | 2015-04-23 09:34:37 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Odin.com> | 2015-05-31 11:40:12 -0700 |
| commit | d498757c5efd41d0add8eb733c6c7e491b51ac8c (patch) | |
| tree | 80de383da1541532951e59b933edc6d187b9449f /drivers/scsi | |
| parent | 943a7021e89cc83a505732a87703a429ac9b03ba (diff) | |
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>
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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/hpsa.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 5007490cdf3a..e029df7b5b98 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -7759,7 +7759,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); |