diff --git a/ChangeLog b/ChangeLog
index 54a51afc0..d92d92117 100644
--- 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 5f0aad119..39432c584 100644
--- 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;