From: hollisb <hollisb@localhost>
Date: Mon, 11 Oct 2004 14:11:33 +0000 (+0000)
Subject: 2004-10-11  Hollis Blanchard  <hollis@penguinppc.org>
X-Git-Tag: 1.98~2189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d61feb07bf57b09d5a5e96684058faa30d91941;p=thirdparty%2Fgrub.git

2004-10-11  Hollis Blanchard  <hollis@penguinppc.org>

    * boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_claim):
    Return -1 if args.base was -1.
---

diff --git a/ChangeLog b/ChangeLog
index 3ae1a45eb..87c688752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-11  Hollis Blanchard  <hollis@penguinppc.org>
+
+    * boot/powerpc/ieee1275/ieee1275.c (grub_ieee1275_claim):
+    Return -1 if args.base was -1.
+
 2004-10-08  Hollis Blanchard  <hollis@penguinppc.org>
 
 	* term/powerpc/ieee1275/ieee1275.c (grub_ofconsole_cls): Use an ANSI
diff --git a/boot/powerpc/ieee1275/ieee1275.c b/boot/powerpc/ieee1275/ieee1275.c
index 96bd9014d..93bdfcfac 100644
--- a/boot/powerpc/ieee1275/ieee1275.c
+++ b/boot/powerpc/ieee1275/ieee1275.c
@@ -420,6 +420,9 @@ grub_ieee1275_claim (grub_addr_t addr, grub_size_t size, unsigned int align,
   if (result)
     *result = args.base;
 
+  if (args.base == (grub_addr_t)-1)
+    return -1;
+
   return 0;
 }