* 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 a82d18965e16e843116b134526027a536153515a..7c0d4bb6fcffe294de9c82403023c9a2216f882d 100644 (file)
--- 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 d161c85772cce2382ef5bbffc358a51aaebdc2d4..e1b31b6d0d81c503e936960f3095ce75e73bbf68 100644 (file)
--- 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;