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
broonie committed Feb 19, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 5bf3db1 + ef30da1 commit bd85d18
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions sound/soc/sh/rcar/core.c
Original file line number Diff line number Diff line change
@@ -363,8 +363,6 @@ struct rsnd_mod *rsnd_mod_next(int *iterator,
if (!mod)
continue;

(*iterator)++;

return mod;
}

4 changes: 2 additions & 2 deletions sound/soc/sh/rcar/rsnd.h
Original file line number Diff line number Diff line change
@@ -374,10 +374,10 @@ struct rsnd_mod *rsnd_mod_next(int *iterator,
int array_size);
#define for_each_rsnd_mod(iterator, pos, io) \
for (iterator = 0; \
(pos = rsnd_mod_next(&iterator, io, NULL, 0));)
(pos = rsnd_mod_next(&iterator, io, NULL, 0)); iterator++)
#define for_each_rsnd_mod_arrays(iterator, pos, io, array, size) \
for (iterator = 0; \
(pos = rsnd_mod_next(&iterator, io, array, size));)
(pos = rsnd_mod_next(&iterator, io, array, size)); iterator++)
#define for_each_rsnd_mod_array(iterator, pos, io, array) \
for_each_rsnd_mod_arrays(iterator, pos, io, array, ARRAY_SIZE(array))

6 changes: 3 additions & 3 deletions sound/soc/sh/rcar/src.c
Original file line number Diff line number Diff line change
@@ -390,6 +390,9 @@ static int rsnd_src_init(struct rsnd_mod *mod,
{
struct rsnd_src *src = rsnd_mod_to_src(mod);

/* reset sync convert_rate */
src->sync.val = 0;

rsnd_mod_power_on(mod);

rsnd_src_activation(mod);
@@ -398,9 +401,6 @@ static int rsnd_src_init(struct rsnd_mod *mod,

rsnd_src_status_clear(mod);

/* reset sync convert_rate */
src->sync.val = 0;

return 0;
}

0 comments on commit bd85d18

Please sign in to comment.