Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[deliverable/linux.git] / sound / soc / fsl / mpc5200_dma.c

diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index 9ff62e3a9b1d1c49a2938c3085f7182d18d8ea44..6096d22283e6e5043386724cf11caf54b597f536 100644 (file)
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -447,6 +447,7 @@ int mpc5200_audio_dma_create(struct of_device *op)
        int size, irq, rc;
        const __be32 *prop;
        void __iomem *regs;
+       int ret;
 
        /* Fetch the registers and IRQ of the PSC */
        irq = irq_of_parse_and_map(op->node, 0);
@@ -463,14 +464,16 @@ int mpc5200_audio_dma_create(struct of_device *op)
        /* Allocate and initialize the driver private data */
        psc_dma = kzalloc(sizeof *psc_dma, GFP_KERNEL);
        if (!psc_dma) {
-               iounmap(regs);
-               return -ENOMEM;
+               ret = -ENOMEM;
+               goto out_unmap;
        }
 
        /* Get the PSC ID */
        prop = of_get_property(op->node, "cell-index", &size);
-       if (!prop || size < sizeof *prop)
-               return -ENODEV;
+       if (!prop || size < sizeof *prop) {
+               ret = -ENODEV;
+               goto out_free;
+       }
 
        spin_lock_init(&psc_dma->lock);
        mutex_init(&psc_dma->mutex);
@@ -493,9 +496,8 @@ int mpc5200_audio_dma_create(struct of_device *op)
        if (!psc_dma->capture.bcom_task ||
            !psc_dma->playback.bcom_task) {
                dev_err(&op->dev, "Could not allocate bestcomm tasks\n");
-               iounmap(regs);
-               kfree(psc_dma);
-               return -ENODEV;
+               ret = -ENODEV;
+               goto out_free;
        }
 
        /* Disable all interrupts and reset the PSC */
@@ -537,12 +539,8 @@ int mpc5200_audio_dma_create(struct of_device *op)
                          &psc_dma_bcom_irq_tx, IRQF_SHARED,
                          "psc-dma-playback", &psc_dma->playback);
        if (rc) {
-               free_irq(psc_dma->irq, psc_dma);
-               free_irq(psc_dma->capture.irq,
-                        &psc_dma->capture);
-               free_irq(psc_dma->playback.irq,
-                        &psc_dma->playback);
-               return -ENODEV;
+               ret = -ENODEV;
+               goto out_irq;
        }
 
        /* Save what we've done so it can be found again later */
@@ -550,6 +548,15 @@ int mpc5200_audio_dma_create(struct of_device *op)
 
        /* Tell the ASoC OF helpers about it */
        return snd_soc_register_platform(&mpc5200_audio_dma_platform);
+out_irq:
+       free_irq(psc_dma->irq, psc_dma);
+       free_irq(psc_dma->capture.irq, &psc_dma->capture);
+       free_irq(psc_dma->playback.irq, &psc_dma->playback);
+out_free:
+       kfree(psc_dma);
+out_unmap:
+       iounmap(regs);
+       return ret;
 }
 EXPORT_SYMBOL_GPL(mpc5200_audio_dma_create);