4 files changed, 26 insertions, 18 deletions

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 35726cbf1f02..b5b3db71e253 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -116,12 +116,13 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
         if (cstream->direction == SND_COMPRESS_PLAYBACK) {
                 cpu_dai->playback_active--;
                 codec_dai->playback_active--;
-                snd_soc_dai_digital_mute(codec_dai, 1);
         } else {
                 cpu_dai->capture_active--;
                 codec_dai->capture_active--;
         }
 
+        snd_soc_dai_digital_mute(codec_dai, 1, cstream->direction);
+
         cpu_dai->active--;
         codec_dai->active--;
         codec->active--;
@@ -178,15 +179,13 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
                         goto out;
         }
 
-        if (cstream->direction == SND_COMPRESS_PLAYBACK) {
-                switch (cmd) {
-                case SNDRV_PCM_TRIGGER_START:
-                        snd_soc_dai_digital_mute(codec_dai, 0);
-                        break;
-                case SNDRV_PCM_TRIGGER_STOP:
-                        snd_soc_dai_digital_mute(codec_dai, 1);
-                        break;
-                }
+        switch (cmd) {
+        case SNDRV_PCM_TRIGGER_START:
+                snd_soc_dai_digital_mute(codec_dai, 0, cstream->direction);
+                break;
+        case SNDRV_PCM_TRIGGER_STOP:
+                snd_soc_dai_digital_mute(codec_dai, 1, cstream->direction);
+                break;
         }
 
 out:
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2370063b5824..4eac22797893 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3540,12 +3540,20 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_tristate);
  * snd_soc_dai_digital_mute - configure DAI system or master clock.
  * @dai: DAI
  * @mute: mute enable
+ * @direction: stream to mute
  *
  * Mutes the DAI DAC.
  */
-int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute)
+int snd_soc_dai_digital_mute(struct snd_soc_dai *dai, int mute,
+                             int direction)
 {
-        if (dai->driver && dai->driver->ops->digital_mute)
+        if (!dai->driver)
+                return -ENOTSUPP;
+
+        if (dai->driver->ops->mute_stream)
+                return dai->driver->ops->mute_stream(dai, mute, direction);
+        else if (direction == SNDRV_PCM_STREAM_PLAYBACK &&
+                 dai->driver->ops->digital_mute)
                 return dai->driver->ops->digital_mute(dai, mute);
         else
                 return -ENOTSUPP;
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 1e36bc81e5af..4d664f3df805 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3247,14 +3247,16 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
                 break;
 
         case SND_SOC_DAPM_POST_PMU:
-                ret = snd_soc_dai_digital_mute(sink, 0);
+                ret = snd_soc_dai_digital_mute(sink, 0,
+                                               SNDRV_PCM_STREAM_PLAYBACK);
                 if (ret != 0 && ret != -ENOTSUPP)
                         dev_warn(sink->dev, "ASoC: Failed to unmute: %d\n", ret);
                 ret = 0;
                 break;
 
         case SND_SOC_DAPM_PRE_PMD:
-                ret = snd_soc_dai_digital_mute(sink, 1);
+                ret = snd_soc_dai_digital_mute(sink, 1,
+                                               SNDRV_PCM_STREAM_PLAYBACK);
                 if (ret != 0 && ret != -ENOTSUPP)
                         dev_warn(sink->dev, "ASoC: Failed to mute: %d\n", ret);
                 ret = 0;
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index cf191e6aebbe..d675b4ae0df6 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -383,8 +383,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream)
         /* Muting the DAC suppresses artifacts caused during digital
          * shutdown, for example from stopping clocks.
          */
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                snd_soc_dai_digital_mute(codec_dai, 1);
+        snd_soc_dai_digital_mute(codec_dai, 1, substream->stream);
 
         if (cpu_dai->driver->ops->shutdown)
                 cpu_dai->driver->ops->shutdown(substream, cpu_dai);
@@ -488,7 +487,7 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream)
         snd_soc_dapm_stream_event(rtd, substream->stream,
                         SND_SOC_DAPM_STREAM_START);
 
-        snd_soc_dai_digital_mute(codec_dai, 0);
+        snd_soc_dai_digital_mute(codec_dai, 0, substream->stream);
 
 out:
         mutex_unlock(&rtd->pcm_mutex);
@@ -586,7 +585,7 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
 
         /* apply codec digital mute */
         if (!codec->active)
-                snd_soc_dai_digital_mute(codec_dai, 1);
+                snd_soc_dai_digital_mute(codec_dai, 1, substream->stream);
 
         /* free any machine hw params */
         if (rtd->dai_link->ops && rtd->dai_link->ops->hw_free)