| From 0eb77118591ff58856547a14e840f598c163096b Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Fri, 20 Jan 2017 04:23:29 +0000 |
| Subject: [PATCH 114/255] ASoC: rsnd: fixup for_each_rsnd_mod_array{s} iterator |
| increment |
| |
| commit 5f222a292 ("ASoC: rsnd: use for_each_rsnd_mod_xxx() ...") |
| modifies rsnd_dai_call() to use for_each_rsnd_mod_arrays(). |
| |
| Current rsnd is incrementing iterator in rsnd_mod_next(), |
| but the iterator will indicate +1 position in for_each loop in |
| this case. Incremental position should be inside for() |
| |
| Reported-by: Hoan Nguyen An <na-hoan@jinso.co.jp> |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| (cherry picked from commit 90ffc1ecc500c04bf43a45d804bb151505c0d6a6) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/core.c | 2 -- |
| sound/soc/sh/rcar/rsnd.h | 4 ++-- |
| 2 files changed, 2 insertions(+), 4 deletions(-) |
| |
| --- 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 *iter |
| if (!mod) |
| continue; |
| |
| - (*iterator)++; |
| - |
| return mod; |
| } |
| |
| --- 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 *iter |
| 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)) |
| |
