Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2841be9a authored by Markus Pargmann's avatar Markus Pargmann Committed by Mark Brown
Browse files

ASoC: fsl-ssi: Fix probe error handling 



This patch fixes the error handling in the fsl-ssi probe function.

Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent b0a23b8b

sound/soc/fsl/fsl_ssi.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -141,6 +141,7 @@ struct fsl_ssi_private { 
	bool imx_ac97;

	bool imx_ac97;

	bool use_dma;

	bool use_dma;

	bool baudclk_locked;

	bool baudclk_locked;

	bool irq_stats;

	u8 i2s_mode;

	u8 i2s_mode;

	spinlock_t baudclk_lock;

	spinlock_t baudclk_lock;

	struct clk *baudclk;

	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,

		ret = devm_request_irq(&pdev->dev, ssi_private->irq,

					fsl_ssi_isr, 0, ssi_private->name,

					fsl_ssi_isr, 0, ssi_private->name,

					ssi_private);

					ssi_private);

		ssi_private->irq_stats = true;

		if (ret < 0) {

		if (ret < 0) {

			dev_err(&pdev->dev, "could not claim irq %u\n",

			dev_err(&pdev->dev, "could not claim irq %u\n",

					ssi_private->irq);

					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);

			ret = imx_pcm_fiq_init(pdev, &ssi_private->fiq_params);

			if (ret)

			if (ret)

				goto error_dev;

				goto error_pcm;

		} else {

		} else {

			ret = imx_pcm_dma_init(pdev);

			ret = imx_pcm_dma_init(pdev);

			if (ret)

			if (ret)

				goto error_dev;

				goto error_pcm;

		}

		}

	}

	}
@@ -1320,6 +1322,10 @@ done: 
	return 0;

	return 0;





error_dai:

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);

	snd_soc_unregister_component(&pdev->dev);





error_dev:

error_dev:
@@ -1333,6 +1339,7 @@ error_clk: 
	}

	}





error_irqmap:

error_irqmap:

	if (ssi_private->irq_stats)

		irq_dispose_mapping(ssi_private->irq);

		irq_dispose_mapping(ssi_private->irq);





	return ret;

	return ret;
@@ -1351,6 +1358,7 @@ static int fsl_ssi_remove(struct platform_device *pdev) 
			clk_disable_unprepare(ssi_private->baudclk);

			clk_disable_unprepare(ssi_private->baudclk);

		clk_disable_unprepare(ssi_private->clk);

		clk_disable_unprepare(ssi_private->clk);

	}

	}

	if (ssi_private->irq_stats)

		irq_dispose_mapping(ssi_private->irq);

		irq_dispose_mapping(ssi_private->irq);





	return 0;

	return 0;