Merge tag 'staging-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / memory / fsl_ifc.c

diff --git a/drivers/memory/fsl_ifc.c b/drivers/memory/fsl_ifc.c
index d062c2f..75a8c38 100644 (file)
--- a/drivers/memory/fsl_ifc.c
+++ b/drivers/memory/fsl_ifc.c
@@ -263,7 +263,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
 
        ret = fsl_ifc_ctrl_init(fsl_ifc_ctrl_dev);
        if (ret < 0)
-               goto err;
+               goto err_unmap_nandirq;
 
        init_waitqueue_head(&fsl_ifc_ctrl_dev->nand_wait);
 
@@ -272,7 +272,7 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
        if (ret != 0) {
                dev_err(&dev->dev, "failed to install irq (%d)\n",
                        fsl_ifc_ctrl_dev->irq);
-               goto err_irq;
+               goto err_unmap_nandirq;
        }
 
        if (fsl_ifc_ctrl_dev->nand_irq) {
@@ -281,17 +281,16 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev)
                if (ret != 0) {
                        dev_err(&dev->dev, "failed to install irq (%d)\n",
                                fsl_ifc_ctrl_dev->nand_irq);
-                       goto err_nandirq;
+                       goto err_free_irq;
                }
        }
 
        return 0;
 
-err_nandirq:
-       free_irq(fsl_ifc_ctrl_dev->nand_irq, fsl_ifc_ctrl_dev);
-       irq_dispose_mapping(fsl_ifc_ctrl_dev->nand_irq);
-err_irq:
+err_free_irq:
        free_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev);
+err_unmap_nandirq:
+       irq_dispose_mapping(fsl_ifc_ctrl_dev->nand_irq);
        irq_dispose_mapping(fsl_ifc_ctrl_dev->irq);
 err:
        iounmap(fsl_ifc_ctrl_dev->gregs);