summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2014-08-11 17:03:08 +0400
committerGrant Likely <grant.likely@linaro.org>2014-08-11 17:03:08 +0400
commitb775e642bf958a02210ac4d4edd1a1b7067c49fa (patch)
treea3425ead7b2738e6a05249a3c3667d1069782330 /sound
parent32147e9a8ea54f2ec9914edeede8a9d9dc02e886 (diff)
parentccdb8ed3b3c739fe99a6f2f474f7ffad3203485d (diff)
downloadlinux-b775e642bf958a02210ac4d4edd1a1b7067c49fa.tar.xz
Merge branch 'devicetree/next-console' into devicetree/next
Diffstat (limited to 'sound')
-rw-r--r--sound/ppc/pmac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 7a43c0c38316..8a431bcb056c 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -992,9 +992,9 @@ static int snd_pmac_detect(struct snd_pmac *chip)
return -ENODEV;
if (!sound) {
- sound = of_find_node_by_name(NULL, "sound");
- while (sound && sound->parent != chip->node)
- sound = of_find_node_by_name(sound, "sound");
+ for_each_node_by_name(sound, "sound")
+ if (sound->parent == chip->node)
+ break;
}
if (! sound) {
of_node_put(chip->node);