Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Brown committed Aug 24, 2016
2 parents a74306f + 93ca33c commit d520519
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion sound/soc/sh/rcar/src.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand Down

0 comments on commit d520519

Please sign in to comment.