From: Kuninori Morimoto Date: Tue, 8 Jun 2021 00:11:50 +0000 (+0900) Subject: ASoC: soc-core: don't use discriminatory terms on snd_soc_runtime_get_dai_fmt() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=640eac4c849d6390f272862ba8db14f28d423670;p=linux.git ASoC: soc-core: don't use discriminatory terms on snd_soc_runtime_get_dai_fmt() snd_soc_runtime_get_dai_fmt() is using discriminatory terms. This patch fixup it. Fixes: ba9e82a1c891 ("ASoC: soc-core: add snd_soc_runtime_get_dai_fmt()") Signed-off-by: Kuninori Morimoto Link: https://lore.kernel.org/r/874ke9dxkp.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4daa9b22b33c6..44e65f984a5c5 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1211,8 +1211,8 @@ found: mask |= SND_SOC_DAIFMT_CLOCK_MASK; if (!(dai_link->dai_fmt & SND_SOC_DAIFMT_INV_MASK)) mask |= SND_SOC_DAIFMT_INV_MASK; - if (!(dai_link->dai_fmt & SND_SOC_DAIFMT_MASTER_MASK)) - mask |= SND_SOC_DAIFMT_MASTER_MASK; + if (!(dai_link->dai_fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK)) + mask |= SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK; dai_link->dai_fmt |= (dai_fmt & mask); }