| Message ID | 20180510114558.20769-1-christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, May 10, 2018 at 01:45:58PM +0200, Christophe JAILLET wrote: > The 'free_irq()' call is not at the right place in the error handling path. > The changed order has been introduced in commit 3d4253d9afab > ("[SCSI] qlogicpti: Convert to new SBUS device framework.") > > Fixes: 3d4253d9afab ("[SCSI] qlogicpti: Convert to new SBUS device framework.") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > Please review carefully. This patch is proposed because it triggers one of > my coccinelle scripts. I'm not 100% sure if correct. Looks good to me. Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> regards, dan carpenter
Christophe, > The 'free_irq()' call is not at the right place in the error handling > path. The changed order has been introduced in commit 3d4253d9afab > ("[SCSI] qlogicpti: Convert to new SBUS device framework.") Applied to 4.18/scsi-queue. Thanks!
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index cec9a14982e6..8578e566ab41 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -1385,6 +1385,9 @@ static int qpti_sbus_probe(struct platform_device *op) qpti->req_cpu, qpti->req_dvma); #undef QSIZE +fail_free_irq: + free_irq(qpti->irq, qpti); + fail_unmap_regs: of_iounmap(&op->resource[0], qpti->qregs, resource_size(&op->resource[0])); @@ -1392,9 +1395,6 @@ static int qpti_sbus_probe(struct platform_device *op) of_iounmap(&op->resource[0], qpti->sreg, sizeof(unsigned char)); -fail_free_irq: - free_irq(qpti->irq, qpti); - fail_unlink: scsi_host_put(host);
The 'free_irq()' call is not at the right place in the error handling path. The changed order has been introduced in commit 3d4253d9afab ("[SCSI] qlogicpti: Convert to new SBUS device framework.") Fixes: 3d4253d9afab ("[SCSI] qlogicpti: Convert to new SBUS device framework.") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- Please review carefully. This patch is proposed because it triggers one of my coccinelle scripts. I'm not 100% sure if correct. The script tries to spot wrongly ordered error handling path. It is: @@ identifier l1, l2; @@ if (...) { ... * goto l1; } ... if (...) { ... * goto l2; } ... *l1: ... *l2: ... --- drivers/scsi/qlogicpti.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)