ASoC: fsl_ssi: AC'97 ops need regmap, clock and cleaning up on failure

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>
Cc: stable@vger.kernel.org

1 files changed, 12 insertions, 6 deletions

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index f2f51e06e22c..c3a83ed0297e 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -1458,12 +1458,6 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                                 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,
@@ -1574,6 +1568,14 @@ static int fsl_ssi_probe(struct platform_device *pdev)
                         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) {
@@ -1657,6 +1659,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);