diff --git a/ChangeLog b/ChangeLog
index 273db00a0..512493b03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/loader/xnu.c (grub_xnu_writetree_toheap_real): Avoid set
+	in if.
+
 2012-02-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/loader/efi/appleloader.c (grub_cmd_appleloader): Move
diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
index d01a6af6c..bd4400188 100644
--- a/grub-core/loader/xnu.c
+++ b/grub-core/loader/xnu.c
@@ -189,10 +189,13 @@ grub_xnu_writetree_toheap_real (void *curptr,
   /* And then the keys. Recursively use this function. */
   for (cur = start; cur; cur = cur->next)
     if (cur->datasize == -1)
-      if (!(curptr = grub_xnu_writetree_toheap_real (curptr,
-						     cur->first_child,
-						     cur->name)))
-	return 0;
+      {
+	curptr = grub_xnu_writetree_toheap_real (curptr,
+						 cur->first_child,
+						 cur->name);
+	if (!curptr)
+	  return 0;
+      }
   return curptr;
 }