* grub-core/efiemu/loadcore_common.c (grub_efiemu_loadcore_load):

	Remove set in if.

diff --git a/ChangeLog b/ChangeLog
index 8e29e8e7960e393beb0036f1ed72440d6043dcd0..cdafb0b24675f4fb955a87f0ba7e0459c855e3a9 100644 (file)
--- 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 b0a22135d97410f9f8968887c05f8c7690064e74..af3d4eac9988ddfbf1f68a79de67ddea054924e3 100644 (file)
--- 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");