mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-23 17:30:02 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Mark Brown 2017-02-19 16:35:36 +00:00
commit bd85d189b3
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/soc/sh/rcar/core.c
View file

@ -363,8 +363,6 @@ struct rsnd_mod *rsnd_mod_next(int *iterator,
if (!mod)
continue;
(*iterator)++;
return mod;
}

4
sound/soc/sh/rcar/rsnd.h
View file

@ -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
sound/soc/sh/rcar/src.c
View file

@ -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;
}