aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolin Chen <nicoleotsuka@gmail.com>2016-07-19 18:36:13 -0400
committerMark Brown <broonie@kernel.org>2016-07-21 07:07:59 -0400
commit622019373c87e335cf926d30ad26b37b9efb27dc (patch)
tree3a353479fd8ed3cc20a1e6e7359b738c491af86f
parent05f33bc5d6df03426e631cea5d1a8568d43ab07f (diff)
ASoC: cs53l30: Fix a bug for TDM slot location validation
The maximum slot number of CS53L30 is 4 while it should support the situation that's less than 4 channels based on the rx_mask. So when the driver validates the last slot location, it should check the last active slot instead of always the 4th one. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/cs53l30.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index 5988b5c672fe..fd5502e3aa34 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -809,8 +809,8 @@ static int cs53l30_set_dai_tdm_slot(struct snd_soc_dai *dai,
809 return -EINVAL; 809 return -EINVAL;
810 } 810 }
811 811
812 /* Validate the last CS53L30 slot */ 812 /* Validate the last active CS53L30 slot */
813 slot_next = loc[CS53L30_TDM_SLOT_MAX - 1] + slot_step - 1; 813 slot_next = loc[i - 1] + slot_step - 1;
814 if (slot_next > 47) { 814 if (slot_next > 47) {
815 dev_err(dai->dev, "slot selection out of bounds: %u\n", 815 dev_err(dai->dev, "slot selection out of bounds: %u\n",
816 slot_next); 816 slot_next);