From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 9 Feb 2012 21:57:51 +0000 (+0100)
Subject: 	* grub-core/efiemu/loadcore_common.c (grub_efiemu_loadcore_load):
X-Git-Tag: 2.00~668
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0df363f328c896fcc64d3ab73e29aff8a55c2934;p=thirdparty%2Fgrub.git

	* grub-core/efiemu/loadcore_common.c (grub_efiemu_loadcore_load):
	Remove set in if.
---

diff --git a/ChangeLog b/ChangeLog
index 8e29e8e79..cdafb0b24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/efiemu/loadcore_common.c (grub_efiemu_loadcore_load):
+	Remove set in if.
+
 2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/net.h: Remove double declarations.
diff --git a/grub-core/efiemu/loadcore_common.c b/grub-core/efiemu/loadcore_common.c
index b0a22135d..af3d4eac9 100644
--- a/grub-core/efiemu/loadcore_common.c
+++ b/grub-core/efiemu/loadcore_common.c
@@ -176,14 +176,16 @@ grub_efiemu_loadcore_load (void)
   switch (grub_efiemu_mode)
     {
     case GRUB_EFIEMU32:
-      if ((err = grub_efiemu_loadcore_load32 (efiemu_core, efiemu_core_size,
-					      efiemu_segments)))
-	  grub_efiemu_loadcore_unload ();
+      err = grub_efiemu_loadcore_load32 (efiemu_core, efiemu_core_size,
+					 efiemu_segments);
+      if (err)
+	grub_efiemu_loadcore_unload ();
       return err;
     case GRUB_EFIEMU64:
-      if ((err = grub_efiemu_loadcore_load64 (efiemu_core, efiemu_core_size,
-					      efiemu_segments)))
-	  grub_efiemu_loadcore_unload ();
+      err = grub_efiemu_loadcore_load64 (efiemu_core, efiemu_core_size,
+					 efiemu_segments);
+      if (err)
+	grub_efiemu_loadcore_unload ();
       return err;
     default:
       return grub_error (GRUB_ERR_BUG, "unknown EFI runtime");