summaryrefslogtreecommitdiff
path: root/sound/soc/sh/rcar/src.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-27 13:45:27 +0100
committerMark Brown <broonie@kernel.org>2016-05-27 13:45:27 +0100
commitdb1f3283edcff33719592f3b374f40cf6e8256f4 (patch)
tree46f1c6d1c4413d6b0da9e1d73276b69f92ebb163 /sound/soc/sh/rcar/src.c
parent84bf51ea9d3495119244b62cc3d07fe4d7bdc1e9 (diff)
parentde1965159a34951a86267d13db4f2a67234139d3 (diff)
downloadlwn-db1f3283edcff33719592f3b374f40cf6e8256f4.tar.gz
lwn-db1f3283edcff33719592f3b374f40cf6e8256f4.zip
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'sound/soc/sh/rcar/src.c')
-rw-r--r--sound/soc/sh/rcar/src.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 15d6ffe8be74..e39f916d0f2f 100644
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -572,6 +572,9 @@ int rsnd_src_probe(struct rsnd_priv *priv)
i = 0;
for_each_child_of_node(node, np) {
+ if (!of_device_is_available(np))
+ goto skip;
+
src = rsnd_src_get(priv, i);
snprintf(name, RSND_SRC_NAME_SIZE, "%s.%d",
@@ -595,6 +598,7 @@ int rsnd_src_probe(struct rsnd_priv *priv)
if (ret)
goto rsnd_src_probe_done;
+skip:
i++;
}