From eb854f6dff24a59378acc8d8eda57a3543a25acc Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Thu, 23 Jan 2014 18:41:51 -0800 Subject: [PATCH] ASoC: rsnd: rsnd_ssi_probe() goes forwarder than rsnd_scu_probe() rsnd_ssi_probe() goes forwarder than rsnd_scu_probe(), since scu will need ssi information on Gen2 Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- sound/soc/sh/rcar/core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index b5af6f5145ea..f316a663e4d3 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -763,6 +763,10 @@ static int rsnd_probe(struct platform_device *pdev) if (ret) return ret; + ret = rsnd_ssi_probe(pdev, info, priv); + if (ret) + return ret; + ret = rsnd_scu_probe(pdev, info, priv); if (ret) return ret; @@ -771,10 +775,6 @@ static int rsnd_probe(struct platform_device *pdev) if (ret) return ret; - ret = rsnd_ssi_probe(pdev, info, priv); - if (ret) - return ret; - ret = rsnd_dai_probe(pdev, info, priv); if (ret) return ret;