diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-08-11 15:03:08 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-08-11 15:03:08 +0200 |
| commit | b775e642bf958a02210ac4d4edd1a1b7067c49fa (patch) | |
| tree | a3425ead7b2738e6a05249a3c3667d1069782330 /sound | |
| parent | of: Fixing OF Selftest build error (diff) | |
| parent | of: Migrate of_find_node_by_name() users to for_each_node_by_name() (diff) | |
| download | linux-b775e642bf958a02210ac4d4edd1a1b7067c49fa.tar.xz linux-b775e642bf958a02210ac4d4edd1a1b7067c49fa.zip | |
Merge branch 'devicetree/next-console' into devicetree/next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/ppc/pmac.c | 6 |
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); |