diff options
| author | Maciej S. Szmigiero <mail@maciej.szmigiero.name> | 2015-08-05 17:25:31 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-14 20:20:56 +0100 |
| commit | 04143d614f3af84a3f39e79a24a7ca740bd39efd (patch) | |
| tree | 2d46da83c8b9720ffa727ea567d68872dbe40919 /sound/soc/fsl | |
| parent | 06cb373692083d169ab080b31c55af91d22b6d99 (diff) | |
| download | lwn-04143d614f3af84a3f39e79a24a7ca740bd39efd.tar.gz lwn-04143d614f3af84a3f39e79a24a7ca740bd39efd.zip | |
ASoC: fsl_ssi: add AC'97 ops setting check and cleanup
Check whether setting AC'97 ops succeeded and clean them
on removal so the fsl_ssi driver can be reloaded.
Signed-off-by: Maciej Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index f3034b90168f..0b4fcd97c533 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1340,7 +1340,11 @@ static int fsl_ssi_probe(struct platform_device *pdev) fsl_ac97_data = ssi_private; - snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev); + ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev); + if (ret) { + dev_err(&pdev->dev, "could not set AC'97 ops\n"); + return ret; + } } else { /* Initialize this copy of the CPU DAI driver structure */ memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template, @@ -1480,6 +1484,9 @@ static int fsl_ssi_remove(struct platform_device *pdev) if (ssi_private->soc->imx) fsl_ssi_imx_clean(pdev, ssi_private); + if (fsl_ssi_is_ac97(ssi_private)) + snd_soc_set_ac97_ops(NULL); + return 0; } |