Merge remote-tracking branches 'asoc/fix/fsl-ssi' and 'asoc/fix/pxa' into asoc-linus

This commit is contained in:
Mark Brown 2014-06-17 15:54:28 +01:00
commit 6b0e233ae5

View file

@ -590,8 +590,8 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream,
else
clkrate = clk_round_rate(ssi_private->baudclk, tmprate);
do_div(clkrate, factor);
afreq = (u32)clkrate / (i + 1);
clkrate /= factor;
afreq = clkrate / (i + 1);
if (freq == afreq)
sub = 0;