diff options
| author | Markus Pargmann <mpa@pengutronix.de> | 2013-12-20 14:11:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-08 17:18:30 +0000 |
| commit | 2841be9afa6c9d37d41386af30cd8813acd06739 (patch) | |
| tree | 2256fea505cea328fd412936e4043e8f71ab5e66 /sound/soc/fsl/fsl_ssi.c | |
| parent | b0a23b8b36e1fb754dcbdfe622e5ca5ded2f188b (diff) | |
| download | talos-op-linux-2841be9afa6c9d37d41386af30cd8813acd06739.tar.gz talos-op-linux-2841be9afa6c9d37d41386af30cd8813acd06739.zip | |
ASoC: fsl-ssi: Fix probe error handling
This patch fixes the error handling in the fsl-ssi probe function.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 816ae4b28a53..19891f2a5de4 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -141,6 +141,7 @@ struct fsl_ssi_private { bool imx_ac97; bool use_dma; bool baudclk_locked; + bool irq_stats; u8 i2s_mode; spinlock_t baudclk_lock; struct clk *baudclk; @@ -1224,6 +1225,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) ret = devm_request_irq(&pdev->dev, ssi_private->irq, fsl_ssi_isr, 0, ssi_private->name, ssi_private); + ssi_private->irq_stats = true; if (ret < 0) { dev_err(&pdev->dev, "could not claim irq %u\n", ssi_private->irq); @@ -1274,11 +1276,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; } } @@ -1320,6 +1322,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: @@ -1333,7 +1339,8 @@ error_clk: } error_irqmap: - irq_dispose_mapping(ssi_private->irq); + if (ssi_private->irq_stats) + irq_dispose_mapping(ssi_private->irq); return ret; } @@ -1351,7 +1358,8 @@ static int fsl_ssi_remove(struct platform_device *pdev) clk_disable_unprepare(ssi_private->baudclk); clk_disable_unprepare(ssi_private->clk); } - irq_dispose_mapping(ssi_private->irq); + if (ssi_private->irq_stats) + irq_dispose_mapping(ssi_private->irq); return 0; } |
