diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:29 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 11:06:29 +0000 |
| commit | 6a47366973be7d234952332e09646981951d3879 (patch) | |
| tree | 1ef55f028c7a017d75d75434223c2b7f907dd935 /sound/soc/soc-core.c | |
| parent | 81fd7e48f44637b7e677b3dc0d298126d81a2320 (diff) | |
| parent | da18396f949ecaa45007d3aeb1b81bd6da092811 (diff) | |
| download | op-kernel-dev-6a47366973be7d234952332e09646981951d3879.zip op-kernel-dev-6a47366973be7d234952332e09646981951d3879.tar.gz | |
Merge remote-tracking branch 'asoc/topic/compress' into asoc-next
Diffstat (limited to 'sound/soc/soc-core.c')
| -rw-r--r-- | sound/soc/soc-core.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2370063..4eac227 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; |
