diff options
Diffstat (limited to 'sound/soc/soc-pcm.c')
-rw-r--r-- | sound/soc/soc-pcm.c | 7 |
1 files changed, 3 insertions, 4 deletions
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) | |||
383 | /* Muting the DAC suppresses artifacts caused during digital | 383 | /* Muting the DAC suppresses artifacts caused during digital |
384 | * shutdown, for example from stopping clocks. | 384 | * shutdown, for example from stopping clocks. |
385 | */ | 385 | */ |
386 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | 386 | snd_soc_dai_digital_mute(codec_dai, 1, substream->stream); |
387 | snd_soc_dai_digital_mute(codec_dai, 1); | ||
388 | 387 | ||
389 | if (cpu_dai->driver->ops->shutdown) | 388 | if (cpu_dai->driver->ops->shutdown) |
390 | cpu_dai->driver->ops->shutdown(substream, cpu_dai); | 389 | cpu_dai->driver->ops->shutdown(substream, cpu_dai); |
@@ -488,7 +487,7 @@ static int soc_pcm_prepare(struct snd_pcm_substream *substream) | |||
488 | snd_soc_dapm_stream_event(rtd, substream->stream, | 487 | snd_soc_dapm_stream_event(rtd, substream->stream, |
489 | SND_SOC_DAPM_STREAM_START); | 488 | SND_SOC_DAPM_STREAM_START); |
490 | 489 | ||
491 | snd_soc_dai_digital_mute(codec_dai, 0); | 490 | snd_soc_dai_digital_mute(codec_dai, 0, substream->stream); |
492 | 491 | ||
493 | out: | 492 | out: |
494 | mutex_unlock(&rtd->pcm_mutex); | 493 | mutex_unlock(&rtd->pcm_mutex); |
@@ -586,7 +585,7 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) | |||
586 | 585 | ||
587 | /* apply codec digital mute */ | 586 | /* apply codec digital mute */ |
588 | if (!codec->active) | 587 | if (!codec->active) |
589 | snd_soc_dai_digital_mute(codec_dai, 1); | 588 | snd_soc_dai_digital_mute(codec_dai, 1, substream->stream); |
590 | 589 | ||
591 | /* free any machine hw params */ | 590 | /* free any machine hw params */ |
592 | if (rtd->dai_link->ops && rtd->dai_link->ops->hw_free) | 591 | if (rtd->dai_link->ops && rtd->dai_link->ops->hw_free) |