]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: cs4271: switch to mute_stream
authorDaniel Mack <zonque@gmail.com>
Thu, 21 Mar 2013 19:43:54 +0000 (20:43 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 22 Mar 2013 10:13:09 +0000 (11:13 +0100)
Use the newly introduced mute_stream DAI operation, and don't mute the
codec if it's called for the _CAPTURE stream.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Alexander Sverdlin <subaparts@yandex.ru>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/cs4271.c

index ac0d3b4844a84b311853a639b78de83598c66317..03036b326732ddfec0fad5b390806d9000a58589 100644 (file)
@@ -388,7 +388,7 @@ static int cs4271_hw_params(struct snd_pcm_substream *substream,
        return cs4271_set_deemph(codec);
 }
 
-static int cs4271_digital_mute(struct snd_soc_dai *dai, int mute)
+static int cs4271_mute_stream(struct snd_soc_dai *dai, int mute, int stream)
 {
        struct snd_soc_codec *codec = dai->codec;
        struct cs4271_private *cs4271 = snd_soc_codec_get_drvdata(codec);
@@ -396,6 +396,9 @@ static int cs4271_digital_mute(struct snd_soc_dai *dai, int mute)
        int val_a = 0;
        int val_b = 0;
 
+       if (stream != SNDRV_PCM_STREAM_PLAYBACK)
+               return 0;
+
        if (mute) {
                val_a = CS4271_VOLA_MUTE;
                val_b = CS4271_VOLB_MUTE;
@@ -442,7 +445,7 @@ static const struct snd_soc_dai_ops cs4271_dai_ops = {
        .hw_params      = cs4271_hw_params,
        .set_sysclk     = cs4271_set_dai_sysclk,
        .set_fmt        = cs4271_set_dai_fmt,
-       .digital_mute   = cs4271_digital_mute,
+       .mute_stream    = cs4271_mute_stream,
 };
 
 static struct snd_soc_dai_driver cs4271_dai = {