diff options
| author | Mark Brown <broonie@kernel.org> | 2020-07-31 19:54:03 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-07-31 19:54:03 +0100 |
| commit | 84569f329f7fcb40b7b1860f273b2909dabf2a2b (patch) | |
| tree | cd332fbb2947f20cc06e3b80da75b189c8ac624e /sound/soc/codecs/max9867.c | |
| parent | c8f7dbdbaa15c700ea02abf92b8d9bda2e91050b (diff) | |
| parent | 8e34f1e867b572f1e20b5250c2897fe5f041c99f (diff) | |
| download | lwn-84569f329f7fcb40b7b1860f273b2909dabf2a2b.tar.gz lwn-84569f329f7fcb40b7b1860f273b2909dabf2a2b.zip | |
Merge remote-tracking branch 'asoc/for-5.9' into asoc-next
Diffstat (limited to 'sound/soc/codecs/max9867.c')
| -rw-r--r-- | sound/soc/codecs/max9867.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/codecs/max9867.c b/sound/soc/codecs/max9867.c index c72cb2888c21..fcb31144d69c 100644 --- a/sound/soc/codecs/max9867.c +++ b/sound/soc/codecs/max9867.c @@ -283,7 +283,7 @@ static int max9867_dai_hw_params(struct snd_pcm_substream *substream, return 0; } -static int max9867_mute(struct snd_soc_dai *dai, int mute) +static int max9867_mute(struct snd_soc_dai *dai, int mute, int direction) { struct snd_soc_component *component = dai->component; struct max9867_priv *max9867 = snd_soc_component_get_drvdata(component); @@ -393,9 +393,10 @@ static int max9867_dai_set_fmt(struct snd_soc_dai *codec_dai, static const struct snd_soc_dai_ops max9867_dai_ops = { .set_sysclk = max9867_set_dai_sysclk, .set_fmt = max9867_dai_set_fmt, - .digital_mute = max9867_mute, + .mute_stream = max9867_mute, .startup = max9867_startup, .hw_params = max9867_dai_hw_params, + .no_capture_mute = 1, }; static struct snd_soc_dai_driver max9867_dai[] = { |