summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorHoward Mitchell <hm@hmbedded.co.uk>2015-03-20 21:13:45 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-06 22:03:56 +0200
commit43ebd1a85ee86416c2d45a3834e7425c396890e9 (patch)
tree0598516fdb4bfd7200a7c03aedaeb08e20f0564f /sound
parentf646e040a619bcea31a6cab378ccaccb6f4cb659 (diff)
ASoC: pcm512x: Fix divide by zero issue
commit f073faa73626f41db7050a69edd5074c53ce6d6c upstream. If den=1 and pllin_rate>20MHz then den and num are adjusted to 0 causing a divide by zero error a few lines further on. Therefore this patch correctly scales num and den such that pllin_rate/den < 20MHz as required in the device data sheet. Signed-off-by: Howard Mitchell <hm@hmbedded.co.uk> Signed-off-by: Mark Brown <broonie@sirena.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/pcm512x.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
index b48624cf995f..8c09e3ffdcaa 100644
--- a/sound/soc/codecs/pcm512x.c
+++ b/sound/soc/codecs/pcm512x.c
@@ -576,8 +576,8 @@ static int pcm512x_find_pll_coeff(struct snd_soc_dai *dai,
/* pllin_rate / P (or here, den) cannot be greater than 20 MHz */
if (pllin_rate / den > 20000000 && num < 8) {
- num *= 20000000 / (pllin_rate / den);
- den *= 20000000 / (pllin_rate / den);
+ num *= DIV_ROUND_UP(pllin_rate / den, 20000000);
+ den *= DIV_ROUND_UP(pllin_rate / den, 20000000);
}
dev_dbg(dev, "num / den = %lu / %lu\n", num, den);