From 300eef7d0632226acdc223cc62cb367e1f415008 Mon Sep 17 00:00:00 2001 From: Viorel Suman Date: Tue, 24 Oct 2017 13:09:27 +0300 Subject: MLK-13946-8: ASoC: fsl_sai: use min(channels,slots) for xMR setting xMR setting must be set as min(channels,slots) since both "channels < slots" and "channels > slots" scenarios are possible. Signed-off-by: Viorel Suman --- sound/soc/fsl/fsl_sai.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sound/soc/fsl/fsl_sai.c') diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index c733c33d512c..ecbb86651077 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -571,8 +571,8 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream, regmap_update_bits(sai->regmap, FSL_SAI_xCR5(tx, offset), FSL_SAI_CR5_WNW_MASK | FSL_SAI_CR5_W0W_MASK | FSL_SAI_CR5_FBT_MASK, val_cr5); - regmap_write(sai->regmap, FSL_SAI_xMR(tx), ~0UL - ((1 << slots) - 1)); - + regmap_write(sai->regmap, FSL_SAI_xMR(tx), + ~0UL - ((1 << min(channels, slots)) - 1)); return 0; } -- cgit v1.2.3