| From: Christophe Jaillet <christophe.jaillet@wanadoo.fr> |
| Date: Thu, 10 May 2018 13:45:58 +0200 |
| Subject: scsi: qlogicpti: Fix an error handling path in 'qpti_sbus_probe()' |
| |
| commit 51b910c3c70986a5a0a84eea11cb8e904e37ba8b upstream. |
| |
| 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> |
| Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/scsi/qlogicpti.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/scsi/qlogicpti.c |
| +++ b/drivers/scsi/qlogicpti.c |
| @@ -1386,6 +1386,9 @@ fail_unmap_queues: |
| 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])); |
| @@ -1393,9 +1396,6 @@ fail_unmap_regs: |
| of_iounmap(&op->resource[0], qpti->sreg, |
| sizeof(unsigned char)); |
| |
| -fail_free_irq: |
| - free_irq(qpti->irq, qpti); |
| - |
| fail_unlink: |
| scsi_host_put(host); |
| |
