diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-05-25 08:58:01 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-05-25 08:58:01 +0200 |
| commit | dad19afce9ad93dda1a10d08afea71b6dd30f19f (patch) | |
| tree | 30e4532c8341fbf89680813d2ec2e888ef99bd85 /include/sound | |
| parent | 2b899f31f1a6db2db4608bac2ac04fe2c4ad89eb (diff) | |
| parent | af2702549d68519ac78228e915d9b2c199056787 (diff) | |
Merge tag 'asoc-fix-v5.13-rc3' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.13
A collection of fixes that have come in since the merge window, mainly
device specific things. The fixes to the generic cards from
Morimoto-san are handling regressions that were introduced in the merge
window on at least the Kontron sl28-var3-ads2.
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dai.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 1358a0ceb4d0..0bc29c4516e7 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -81,7 +81,7 @@ struct snd_compr_stream; #define SND_SOC_DAIFMT_CBP_CFP (1 << 12) /* codec clk provider & frame provider */ #define SND_SOC_DAIFMT_CBC_CFP (2 << 12) /* codec clk consumer & frame provider */ #define SND_SOC_DAIFMT_CBP_CFC (3 << 12) /* codec clk provider & frame consumer */ -#define SND_SOC_DAIFMT_CBC_CFC (4 << 12) /* codec clk consumer & frame follower */ +#define SND_SOC_DAIFMT_CBC_CFC (4 << 12) /* codec clk consumer & frame consumer */ /* previous definitions kept for backwards-compatibility, do not use in new contributions */ #define SND_SOC_DAIFMT_CBM_CFM SND_SOC_DAIFMT_CBP_CFP |