2 files changed, 17 insertions, 4 deletions

diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index c6fa03e2114a..bd40849454a8 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -501,13 +501,12 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)
         imx_ssi_ac97_read(ac97, 0);
 }
 
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops imx_ssi_ac97_ops = {
         .read           = imx_ssi_ac97_read,
         .write          = imx_ssi_ac97_write,
         .reset          = imx_ssi_ac97_reset,
         .warm_reset     = imx_ssi_ac97_warm_reset
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
 static int imx_ssi_probe(struct platform_device *pdev)
 {
@@ -583,6 +582,12 @@ static int imx_ssi_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, ssi);
 
+        ret = snd_soc_set_ac97_ops(&imx_ssi_ac97_ops);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "Failed to set AC'97 ops: %d\n", ret);
+                goto failed_register;
+        }
+
         ret = snd_soc_register_component(&pdev->dev, &imx_component,
                                          dai, 1);
         if (ret) {
@@ -630,6 +635,7 @@ failed_register:
         release_mem_region(res->start, resource_size(res));
         clk_disable_unprepare(ssi->clk);
 failed_clk:
+        snd_soc_set_ac97_ops(NULL);
 
         return ret;
 }
@@ -649,6 +655,7 @@ static int imx_ssi_remove(struct platform_device *pdev)
 
         release_mem_region(res->start, resource_size(res));
         clk_disable_unprepare(ssi->clk);
+        snd_soc_set_ac97_ops(NULL);
 
         return 0;
 }
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 4141b35ef0bb..3ef7a0c92efa 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -131,13 +131,12 @@ static void psc_ac97_cold_reset(struct snd_ac97 *ac97)
         psc_ac97_warm_reset(ac97);
 }
 
-struct snd_ac97_bus_ops soc_ac97_ops = {
+static struct snd_ac97_bus_ops psc_ac97_ops = {
         .read           = psc_ac97_read,
         .write          = psc_ac97_write,
         .reset          = psc_ac97_cold_reset,
         .warm_reset     = psc_ac97_warm_reset,
 };
-EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
 static int psc_ac97_hw_analog_params(struct snd_pcm_substream *substream,
                                  struct snd_pcm_hw_params *params,
@@ -290,6 +289,12 @@ static int psc_ac97_of_probe(struct platform_device *op)
         if (rc != 0)
                 return rc;
 
+        rc = snd_soc_set_ac97_ops(&psc_ac97_ops);
+        if (rc != 0) {
+                dev_err(&op->dev, "Failed to set AC'97 ops: %d\n", ret);
+                return rc;
+        }
+
         rc = snd_soc_register_component(&op->dev, &psc_ac97_component,
                                         psc_ac97_dai, ARRAY_SIZE(psc_ac97_dai));
         if (rc != 0) {
@@ -318,6 +323,7 @@ static int psc_ac97_of_remove(struct platform_device *op)
 {
         mpc5200_audio_dma_destroy(op);
         snd_soc_unregister_component(&op->dev);
+        snd_soc_set_ac97_ops(NULL);
         return 0;
 }