From: proski <proski@localhost>
Date: Mon, 14 Jan 2008 04:16:20 +0000 (+0000)
Subject: * disk/ieee1275/ofdisk.c (grub_ofdisk_open): Don't use
X-Git-Tag: 1.98~1709
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44cb1ec888e034684697e774890f582125d56639;p=thirdparty%2Fgrub.git

* disk/ieee1275/ofdisk.c (grub_ofdisk_open): Don't use
grub_errno if no errors have been detected.
---

diff --git a/ChangeLog b/ChangeLog
index a82d18965..7c0d4bb6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-13  Pavel Roskin  <proski@gnu.org>
+
+	* disk/ieee1275/ofdisk.c (grub_ofdisk_open): Don't use
+	grub_errno if no errors have been detected.
+
 2008-01-12  Robert Millan  <rmh@aybabtu.com>
 
 	* include/grub/util/getroot.h (grub_dev_abstraction_types): New enum.
diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index d161c8577..e1b31b6d0 100644
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -104,9 +104,11 @@ grub_ofdisk_open (const char *name, grub_disk_t disk)
   /* XXX: Read this, somehow.  */
   disk->has_partitions = 1;
   disk->data = (void *) dev_ihandle;
+  grub_free (devpath);
+  return 0;
 
  fail:
-  if (grub_errno && dev_ihandle)
+  if (dev_ihandle)
     grub_ieee1275_close (dev_ihandle);
   grub_free (devpath);
   return grub_errno;