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

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 9bfef55d77d10a8202207ea9ae077a71422d3e0a..3043d576856b21f6eaa77a6432c257296412b66f 100644 (file)
--- 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;