diff options
| author | Nicolin Chen <nicoleotsuka@gmail.com> | 2018-04-08 16:57:35 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-04-12 15:27:02 +0100 |
| commit | c656941df9bc80f7ec65b92ca73c42f8b0b62628 (patch) | |
| tree | ebaaf7bfc627026d58282bd66e7e30a10fe899ed /sound | |
| parent | 573eda59c772d11fc2b56d525dfb698b0f87ddb3 (diff) | |
| download | linux-0-day-c656941df9bc80f7ec65b92ca73c42f8b0b62628.tar.gz linux-0-day-c656941df9bc80f7ec65b92ca73c42f8b0b62628.tar.xz | |
ASoC: fsl_esai: Fix divisor calculation failure at lower ratio
When the desired ratio is less than 256, the savesub (tolerance)
in the calculation would become 0. This will then fail the loop-
search immediately without reporting any errors.
But if the ratio is smaller enough, there is no need to calculate
the tolerance because PM divisor alone is enough to get the ratio.
So a simple fix could be just to set PM directly instead of going
into the loop-search.
Reported-by: Marek Vasut <marex@denx.de>
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Tested-by: Marek Vasut <marex@denx.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/fsl_esai.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index 40a700493f4c8..da8fd98c7f51c 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -144,6 +144,13 @@ static int fsl_esai_divisor_cal(struct snd_soc_dai *dai, bool tx, u32 ratio, psr = ratio <= 256 * maxfp ? ESAI_xCCR_xPSR_BYPASS : ESAI_xCCR_xPSR_DIV8; + /* Do not loop-search if PM (1 ~ 256) alone can serve the ratio */ + if (ratio <= 256) { + pm = ratio; + fp = 1; + goto out; + } + /* Set the max fluctuation -- 0.1% of the max devisor */ savesub = (psr ? 1 : 8) * 256 * maxfp / 1000; |