From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 31 Mar 2010 20:01:37 +0000 (+0200)
Subject: 	* kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if
X-Git-Tag: 1.99~993
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f9fd65df54d5f114a0f33ac30f49c6b2226ded30;p=thirdparty%2Fgrub.git

	* kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if
	returned by firmware.
---

diff --git a/ChangeLog b/ChangeLog
index 5367493a2..d05dd5a7d 100644
--- 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 ae1eb5522..cf9e1a870 100644
--- 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;