| From 695b78b548d8a26288f041e907ff17758df9e1d5 Mon Sep 17 00:00:00 2001 |
| From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name> |
| Date: Mon, 20 Nov 2017 23:14:55 +0100 |
| Subject: ASoC: fsl_ssi: AC'97 ops need regmap, clock and cleaning up on failure |
| |
| From: Maciej S. Szmigiero <mail@maciej.szmigiero.name> |
| |
| commit 695b78b548d8a26288f041e907ff17758df9e1d5 upstream. |
| |
| AC'97 ops (register read / write) need SSI regmap and clock, so they have |
| to be set after them. |
| |
| We also need to set these ops back to NULL if we fail the probe. |
| |
| Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name> |
| Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/soc/fsl/fsl_ssi.c | 18 ++++++++++++------ |
| 1 file changed, 12 insertions(+), 6 deletions(-) |
| |
| --- a/sound/soc/fsl/fsl_ssi.c |
| +++ b/sound/soc/fsl/fsl_ssi.c |
| @@ -1467,12 +1467,6 @@ static int fsl_ssi_probe(struct platform |
| sizeof(fsl_ssi_ac97_dai)); |
| |
| fsl_ac97_data = ssi_private; |
| - |
| - 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, |
| @@ -1583,6 +1577,14 @@ static int fsl_ssi_probe(struct platform |
| return ret; |
| } |
| |
| + if (fsl_ssi_is_ac97(ssi_private)) { |
| + 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"); |
| + goto error_ac97_ops; |
| + } |
| + } |
| + |
| ret = devm_snd_soc_register_component(&pdev->dev, &fsl_ssi_component, |
| &ssi_private->cpu_dai_drv, 1); |
| if (ret) { |
| @@ -1666,6 +1668,10 @@ error_sound_card: |
| fsl_ssi_debugfs_remove(&ssi_private->dbg_stats); |
| |
| error_asoc_register: |
| + if (fsl_ssi_is_ac97(ssi_private)) |
| + snd_soc_set_ac97_ops(NULL); |
| + |
| +error_ac97_ops: |
| if (ssi_private->soc->imx) |
| fsl_ssi_imx_clean(pdev, ssi_private); |
| |