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

3 files changed, 5 insertions, 7 deletions

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 99b5b0835c1e..47b370cb2d3b 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -363,8 +363,6 @@ struct rsnd_mod *rsnd_mod_next(int *iterator,
                 if (!mod)
                         continue;
 
-                (*iterator)++;
-
                 return mod;
         }
 
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index b90df77662df..7410ec0174db 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -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))
 
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 3a8f65bd1bf9..42db48db09ba 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -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;
 }