* kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if

	returned by firmware.

diff --git a/ChangeLog b/ChangeLog
index 5367493a29d27430f7a77d3b399ae78abfe48e94..d05dd5a7db7f759c4238b7cff396cbcc4cfada69 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if
+       returned by firmware.
+
 2010-03-30  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * loader/i386/multiboot_mbi2.c (retrieve_video_parameters): Fix

diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index ae1eb552204e871a390f02cf173ab9b459b24dc5..cf9e1a870d3d2d5b624736a724c6de76a437fb31 100644 (file)
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -73,10 +73,16 @@ grub_children_iterate (char *devpath,
                                      IEEE1275_MAX_PROP_LEN, &actual))
        childtype[0] = 0;
 
+      if (dev == child)
+       continue;
+
       if (grub_ieee1275_package_to_path (child, childpath,
                                         IEEE1275_MAX_PATH_LEN, &actual))
        continue;
 
+      if (grub_strcmp (devpath, childpath) == 0)
+       continue;
+
       if (grub_ieee1275_get_property (child, "name", childname,
                                      IEEE1275_MAX_PROP_LEN, &actual))
        continue;