Commit 5b64c173 authored Sep 16, 2015 by Adam Thomson Committed by Mark Brown Sep 19, 2015

ASoC: fsl_ssi: Fix checking of dai format for AC97 mode



Current code incorrectly treats dai format for AC97 as bit mask
whereas it's actually an integer value. This causes DAI formats
other than AC97 (e.g. DSP_B) to trigger AC97 related code,
which is incorrect and breaks functionality. This patch fixes
the code to correctly compare values to determine AC97 or not.

Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Acked-by: Timur Tabi <timur@tabi.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 6ff33f39

sound/soc/fsl/fsl_ssi.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -249,7 +249,8 @@ MODULE_DEVICE_TABLE(of, fsl_ssi_ids);

		static bool fsl_ssi_is_ac97(struct fsl_ssi_private *ssi_private)
		{
		return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97);
		return (ssi_private->dai_fmt & SND_SOC_DAIFMT_FORMAT_MASK) ==
		SND_SOC_DAIFMT_AC97;
		}

		static bool fsl_ssi_is_i2s_master(struct fsl_ssi_private *ssi_private)
		@@ -947,7 +948,7 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
		CCSR_SSI_SCR_TCH_EN);
		}

		if (fmt & SND_SOC_DAIFMT_AC97)
		if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_AC97)
		fsl_ssi_setup_ac97(ssi_private);

		return 0;