Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaf1ac8b authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

ASoC: TWL4030: Check the interface format for 4 channel mode 



In addition to the operating mode check, also check the
codec's interface format in case of four channel mode.
If the codec is not in TDM (DSP_A) mode, return with error.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 16a30fbb

sound/soc/codecs/twl4030.c

+9 −3
Original line number Diff line number Diff line
@@ -1608,9 +1608,15 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream, 


	 /* If the substream has 4 channel, do the necessary setup */

	if (params_channels(params) == 4) {

		/* Safety check: are we in the correct operating mode? */

		if ((twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE) &

			TWL4030_OPTION_1))

		u8 format, mode;



		format = twl4030_read_reg_cache(codec, TWL4030_REG_AUDIO_IF);

		mode = twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE);



		/* Safety check: are we in the correct operating mode and

		 * the interface is in TDM mode? */

		if ((mode & TWL4030_OPTION_1) &&

		    ((format & TWL4030_AIF_FORMAT) == TWL4030_AIF_FORMAT_TDM))

			twl4030_tdm_enable(codec, substream->stream, 1);

		else

			return -EINVAL;