git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
sh
/
rcar
/
ssi.c
diff --git
a/sound/soc/sh/rcar/ssi.c
b/sound/soc/sh/rcar/ssi.c
index fffc07e7262741781dbe1bf00e9acb05c3c5a766..03c2a1f02643b8eac6a56918a759b8fb95352f72 100644
(file)
--- a/
sound/soc/sh/rcar/ssi.c
+++ b/
sound/soc/sh/rcar/ssi.c
@@
-1112,6
+1112,9
@@
int rsnd_ssi_probe(struct rsnd_priv *priv)
i = 0;
for_each_child_of_node(node, np) {
+ if (!of_device_is_available(np))
+ goto skip;
+
ssi = rsnd_ssi_get(priv, i);
snprintf(name, RSND_SSI_NAME_SIZE, "%s.%d",
@@
-1148,7
+1151,7
@@
int rsnd_ssi_probe(struct rsnd_priv *priv)
of_node_put(np);
goto rsnd_ssi_probe_done;
}
-
+skip:
i++;
}