diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 12:06:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 12:06:29 +0100 |
| commit | 6a47366973be7d234952332e09646981951d3879 (patch) | |
| tree | 1ef55f028c7a017d75d75434223c2b7f907dd935 /sound/soc/soc-dapm.c | |
| parent | Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next (diff) | |
| parent | ASoC: core: Allow digital mute for capture (diff) | |
| download | linux-6a47366973be7d234952332e09646981951d3879.tar.xz linux-6a47366973be7d234952332e09646981951d3879.zip | |
Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
Diffstat (limited to 'sound/soc/soc-dapm.c')
| -rw-r--r-- | sound/soc/soc-dapm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 258acadb9e7d..1d6a9b3ceb27 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3255,14 +3255,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; |