diff mbox

[v3,1/9] ASoC: fsl-ssi: Fix probe error handling

Message ID 1387367865-26391-2-git-send-email-mpa@pengutronix.de (mailing list archive)
State New, archived
Headers show

Commit Message

Markus Pargmann Dec. 18, 2013, 11:57 a.m. UTC 
This patch fixes the error handling in the fsl-ssi probe function.

Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
 sound/soc/fsl/fsl_ssi.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Mark Brown Dec. 19, 2013, 1:03 p.m. UTC | #1 
On Wed, Dec 18, 2013 at 12:57:37PM +0100, Markus Pargmann wrote:
> This patch fixes the error handling in the fsl-ssi probe function.

This doesn't apply against current code, please check and resend.

>  error_irqmap:
> -	irq_dispose_mapping(ssi_private->irq);
> +	if (ssi_private->use_dma && !of_device_is_compatible(pdev->dev.of_node,
> +				"fsl,imx21-ssi"))
> +		irq_dispose_mapping(ssi_private->irq);

This test is icky, a flag set when we create the mapping would be neter.
Markus Pargmann Dec. 20, 2013, 9:52 a.m. UTC | #2 
Hi,

On Thu, Dec 19, 2013 at 01:03:34PM +0000, Mark Brown wrote:
> On Wed, Dec 18, 2013 at 12:57:37PM +0100, Markus Pargmann wrote:
> > This patch fixes the error handling in the fsl-ssi probe function.
> 
> This doesn't apply against current code, please check and resend.

Okay, I will rebase on your topic/fsl again.

> 
> >  error_irqmap:
> > -	irq_dispose_mapping(ssi_private->irq);
> > +	if (ssi_private->use_dma && !of_device_is_compatible(pdev->dev.of_node,
> > +				"fsl,imx21-ssi"))
> > +		irq_dispose_mapping(ssi_private->irq);
> 
> This test is icky, a flag set when we create the mapping would be neter.

Fixed.

Thanks,

Markus
diff mbox

Patch

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index f9f4569..cd9ad8c 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1007,11 +1007,11 @@  static int fsl_ssi_probe(struct platform_device *pdev)
 
 			ret = imx_pcm_fiq_init(pdev, &ssi_private->fiq_params);
 			if (ret)
-				goto error_dev;
+				goto error_pcm;
 		} else {
 			ret = imx_pcm_dma_init(pdev);
 			if (ret)
-				goto error_dev;
+				goto error_pcm;
 		}
 	}
 
@@ -1053,6 +1053,10 @@  done:
 	return 0;
 
 error_dai:
+	if (ssi_private->ssi_on_imx && !ssi_private->use_dma)
+		imx_pcm_fiq_exit(pdev);
+
+error_pcm:
 	snd_soc_unregister_component(&pdev->dev);
 
 error_dev:
@@ -1063,7 +1067,9 @@  error_clk:
 		clk_disable_unprepare(ssi_private->clk);
 
 error_irqmap:
-	irq_dispose_mapping(ssi_private->irq);
+	if (ssi_private->use_dma && !of_device_is_compatible(pdev->dev.of_node,
+				"fsl,imx21-ssi"))
+		irq_dispose_mapping(ssi_private->irq);
 
 	return ret;
 }