| Message ID | 20150416134936.30238.72827.stgit@brunhilda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/16/2015 03:49 PM, Don Brace wrote: > From: Robert Elliott <elliott@hp.com> > > 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> > --- > 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 8aeef06..dc8299c 100644 > --- a/drivers/scsi/hpsa.c > +++ b/drivers/scsi/hpsa.c > @@ -7773,7 +7773,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); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On 04/16/2015 03:49 PM, Don Brace wrote: > From: Robert Elliott <elliott@hp.com> > > 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> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Tomas -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 8aeef06..dc8299c 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -7773,7 +7773,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);