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

6b0e233a · Mark Brown · 69530552 · acf2c60a · 5ba4059c · 6b0e233a
Commit 6b0e233a authored Jun 17, 2014 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/soc/fsl/fsl_ssi.c sound/soc/fsl/fsl_ssi.c +2 -2

No files found.
--- 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;