From: Mark Brown <broonie@kernel.org>
Date: Mon, 16 Mar 2015 12:03:15 +0000 (+0000)
Subject: Merge remote-tracking branches 'asoc/fix/ak4671', 'asoc/fix/control', 'asoc/fix/da732... 
X-Git-Tag: v4.0-rc5~27^2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af6b7a82fd2416d68bcf46d18d96de9b59e43b06;p=profile%2Fcommon%2Fplatform%2Fkernel%2Flinux-artik7.git

Merge remote-tracking branches 'asoc/fix/ak4671', 'asoc/fix/control', 'asoc/fix/da732x', 'asoc/fix/fsl-ssi', 'asoc/fix/lock' and 'asoc/fix/rt286' into asoc-linus
---

af6b7a82fd2416d68bcf46d18d96de9b59e43b06
diff --cc sound/soc/fsl/fsl_ssi.c
index b9fabbf,2595611,2595611,2595611,7eebc08,2595611,2595611..6b0c8f7
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@@@@@@@ -603,7 -603,11 -603,11 -603,11 -603,7 -603,11 -603,11 +603,7 @@@@@@@@ static int fsl_ssi_set_bclk(struct snd_
       	factor = (div2 + 1) * (7 * psr + 1) * 2;
       
       	for (i = 0; i < 255; i++) {
 --- --		/* The bclk rate must be smaller than 1/5 sysclk rate */
 --- --		if (factor * (i + 1) < 5)
 --- --			continue;
 --- --
---- --		tmprate = freq * factor * (i + 2);
++++ ++		tmprate = freq * factor * (i + 1);
       
       		if (baudclk_is_used)
       			clkrate = clk_get_rate(ssi_private->baudclk);