vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Remove set in if.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-09 22:57:51 +01:00
parent b2c0c4a6c6
commit 0df363f328
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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.

14
grub-core/efiemu/loadcore_common.c
View File

@ -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");