| From a90d8fa2564da6fc05815a6e74836290183fd505 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Thu, 23 Jan 2014 18:40:34 -0800 |
| Subject: ASoC: rsnd: SCU should be called before SSI |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| (cherry picked from commit be213ac1af893410eb8256010edf136b4099e827) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/gen.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c |
| index 76828c20fb50..db486aae6b8b 100644 |
| --- a/sound/soc/sh/rcar/gen.c |
| +++ b/sound/soc/sh/rcar/gen.c |
| @@ -182,14 +182,14 @@ int rsnd_gen_path_init(struct rsnd_priv *priv, |
| rsnd_dai_is_play(rdai, io)); |
| id = rsnd_mod_id(mod); |
| |
| - /* SSI */ |
| - mod = rsnd_ssi_mod_get(priv, id); |
| + /* SCU */ |
| + mod = rsnd_scu_mod_get(priv, id); |
| ret = rsnd_dai_connect(rdai, mod, io); |
| if (ret < 0) |
| return ret; |
| |
| - /* SCU */ |
| - mod = rsnd_scu_mod_get(priv, id); |
| + /* SSI */ |
| + mod = rsnd_ssi_mod_get(priv, id); |
| ret = rsnd_dai_connect(rdai, mod, io); |
| |
| return ret; |
| -- |
| 2.1.2 |
| |
