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

…into asoc-linus
git-mirror · Jun 17, 2014 · 6b0e233 · 6b0e233
3 parents 6953055 + acf2c60 + 5ba4059
commit 6b0e233
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
@@ -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;