← Back to branch summary

~ilya-yanok/ubuntu/precise/grub2/fix-for-948716

« back to all changes in this revision

Viewing changes to efiemu/loadcore.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Millan
  • Date: 2009-07-25 19:00:53 UTC
  • mfrom: (1.6.3 upstream)
  • mto: (17.4.13 sid)
  • mto: This revision was merged to the branch mainline in revision 53.
  • Revision ID: james.westby@ubuntu.com-20090725190053-uv3lm6ya3zxs77ep
Import upstream version 1.96+20090725

Show diffs side-by-side

added added

removed removed

Lines of Context:
efiemu/loadcore.c
352
352
                                    grub_efiemu_segment_t segments)
353
353
{
354
354
  grub_err_t err;
355
 
  err = grub_efiemu_load_segments (segments, core);
356
 
  if (err)
357
 
    return err;
358
 
 
359
 
  err = grub_efiemu_resolve_symbols (segments, core);
360
 
  if (err)
361
 
    return err;
362
 
 
363
 
  err = SUFFIX (grub_arch_efiemu_relocate_symbols) (segments,
364
 
                                                    grub_efiemu_elfsyms,
365
 
                                                    core);
366
 
  if (err)
 
355
  if ((err = grub_efiemu_load_segments (segments, core)))
 
356
    return err;
 
357
  if ((err = grub_efiemu_resolve_symbols (segments, core)))
 
358
    return err;
 
359
  if ((err = SUFFIX (grub_arch_efiemu_relocate_symbols) (segments,
 
360
                                                         grub_efiemu_elfsyms,
 
361
                                                         core)))
367
362
    return err;
368
363
 
369
364
  return GRUB_ERR_NONE;