diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-01-21 01:57:17 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-01-22 17:12:25 +0000 |
| commit | 654a12b86305b1fd78279616f876b8d21d146a5e (patch) | |
| tree | 75d26436d812f82cde30a76a8801e9f2b5433a68 /sound | |
| parent | ea96380baa2794cb6e0d5bfbcca0c78b237a5f8a (diff) | |
| download | linux-654a12b86305b1fd78279616f876b8d21d146a5e.tar.gz linux-654a12b86305b1fd78279616f876b8d21d146a5e.tar.bz2 linux-654a12b86305b1fd78279616f876b8d21d146a5e.zip | |
ASoC: rsnd: don't overwrite io on rsnd_cmd_init()
Current rsnd_cmd_init() overwrites "io" which will be used end of this
function. This patch solved this issue.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/sh/rcar/cmd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c index cd1f064e63c4..e77e4935b4ea 100644 --- a/sound/soc/sh/rcar/cmd.c +++ b/sound/soc/sh/rcar/cmd.c @@ -38,6 +38,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, if (mix) { struct rsnd_dai *rdai; + struct rsnd_dai_stream *tio; int i; u32 path[] = { [0] = 0, @@ -55,12 +56,12 @@ static int rsnd_cmd_init(struct rsnd_mod *mod, */ data = 0; for_each_rsnd_dai(rdai, priv, i) { - io = &rdai->playback; - if (mix == rsnd_io_to_mod_mix(io)) + tio = &rdai->playback; + if (mix == rsnd_io_to_mod_mix(tio)) data |= path[rsnd_mod_id(src)]; - io = &rdai->capture; - if (mix == rsnd_io_to_mod_mix(io)) + tio = &rdai->capture; + if (mix == rsnd_io_to_mod_mix(tio)) data |= path[rsnd_mod_id(src)]; } |