diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-08-17 11:41:59 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-08-17 11:41:59 +0300 |
commit | 5461bd81bf7f86503f393b0b1d57e69b1f1bd44e (patch) | |
tree | 25ec4a2f43019c4d7cc76eb6a967ec450add9401 /sound/soc/fsl/fsl_ssi.c | |
parent | 949163015ce6fdb76a5e846a3582d3c40c23c001 (diff) | |
parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) | |
download | linux-5461bd81bf7f86503f393b0b1d57e69b1f1bd44e.tar.xz |
Merge tag 'v4.2-rc7' into x86/boot, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
-rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index c7647e066cfd..c0b940e2019f 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -633,7 +633,7 @@ static int fsl_ssi_set_bclk(struct snd_pcm_substream *substream, sub *= 100000; do_div(sub, freq); - if (sub < savesub) { + if (sub < savesub && !(i == 0 && psr == 0 && div2 == 0)) { baudrate = tmprate; savesub = sub; pm = i; |