Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

d5205195 · Mark Brown · a74306fe · 93ca33c9 · d5205195
Commit d5205195 authored Aug 24, 2016 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

sound/soc/sh/rcar/src.c sound/soc/sh/rcar/src.c +5 -1

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

 	/*