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

Commit 049cfaaa authored by Ben Gardiner's avatar Ben Gardiner Committed by Mark Brown
Browse files

ASoC: davinci-mcasp: correct tdm_slots limit 



The current check for the number of tdm-slots specified by platform data is
always true (x >= 2 || x <= 32); therefore the else branch that warns of an
incorrect number of slots can never be taken.

Check that the number of tdm slots specified by platform data is between 2
and 32, inclusive.

Signed-off-by: default avatarBen Gardiner <bengardiner@nanometrics.ca>
Reviewed-by: default avatarJames Nuss <jamesnuss@nanometrics.ca>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b3c27b51

sound/soc/davinci/davinci-mcasp.c

+2 −2
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream) 
		mcasp_set_reg(dev->base + DAVINCI_MCASP_TXTDM_REG, mask);

		mcasp_set_bits(dev->base + DAVINCI_MCASP_TXFMT_REG, TXORD);



		if ((dev->tdm_slots >= 2) || (dev->tdm_slots <= 32))

		if ((dev->tdm_slots >= 2) && (dev->tdm_slots <= 32))

			mcasp_mod_bits(dev->base + DAVINCI_MCASP_TXFMCTL_REG,

					FSXMOD(dev->tdm_slots), FSXMOD(0x1FF));

		else
@@ -660,7 +660,7 @@ static void davinci_hw_param(struct davinci_audio_dev *dev, int stream) 
				AHCLKRE);

		mcasp_set_reg(dev->base + DAVINCI_MCASP_RXTDM_REG, mask);



		if ((dev->tdm_slots >= 2) || (dev->tdm_slots <= 32))

		if ((dev->tdm_slots >= 2) && (dev->tdm_slots <= 32))

			mcasp_mod_bits(dev->base + DAVINCI_MCASP_RXFMCTL_REG,

					FSRMOD(dev->tdm_slots), FSRMOD(0x1FF));

		else