2010-02-06 Vladimir Serbinenko <phcoder@gmail.com>

	* kern/ieee1275/openfw.c (grub_devalias_iterate): Stop iterating on
	error.

diff --git a/ChangeLog b/ChangeLog
index 54a51afc09f41b8b5370361f9add2c6d972d1d63..d92d921171d4a4631729e7c77675723ab53eeb4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * kern/ieee1275/openfw.c (grub_devalias_iterate): Stop iterating on
+       error.
+
 2010-02-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/hostdisk.c (open_device): Don't use partition device when reading

diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index 5f0aad119e18749ee91ec97948f7bcb474c4d7a8..39432c584efb5c41c7c5be815149c898556d0104 100644 (file)
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -135,7 +135,7 @@ grub_devalias_iterate (int (*hook) (struct grub_ieee1275_devalias *alias))
   /* Find the first property.  */
   aliasname[0] = '\0';
 
-  while (grub_ieee1275_next_property (aliases, aliasname, aliasname))
+  while (grub_ieee1275_next_property (aliases, aliasname, aliasname) > 0)
     {
       grub_ieee1275_phandle_t dev;
       grub_ssize_t pathlen;