diff options
| author | Mark Brown <broonie@kernel.org> | 2016-08-24 19:05:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-24 19:05:21 +0100 |
| commit | d520519518de1423c1a7b7df1a008e58e33de9f8 (patch) | |
| tree | d64b676855d4167318ba3e6b29c7f8a7f6c7a3ef /sound | |
| parent | a74306fe94c82429fd0ec9f4316de90b405012d2 (diff) | |
| parent | 93ca33c99f22a0a096f83f19c9f887aeb67507a1 (diff) | |
| download | linux-0-day-d520519518de1423c1a7b7df1a008e58e33de9f8.tar.gz linux-0-day-d520519518de1423c1a7b7df1a008e58e33de9f8.tar.xz | |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/rcar/src.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index e39f916d0f2fa..969a5169de255 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c @@ -226,8 +226,12 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io, ifscr = 0; fsrate = 0; if (fin != fout) { + u64 n; + ifscr = 1; - fsrate = 0x0400000 / fout * fin; + n = (u64)0x0400000 * fin; + do_div(n, fout); + fsrate = n; } /* |