From: robertmh <robertmh@localhost>
Date: Mon, 11 Aug 2008 10:33:14 +0000 (+0000)
Subject: 2008-08-11  Robert Millan  <rmh@aybabtu.com>
X-Git-Tag: 1.98~1317
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e352e9cde3a9217b1b9767ac792751c7a9fa2854;p=thirdparty%2Fgrub.git

2008-08-11  Robert Millan  <rmh@aybabtu.com>

        * kern/device.c (grub_device_open): Do not handle grub_disk_open()
        errors.  Leave it to the upper layer to handle them.
---

diff --git a/ChangeLog b/ChangeLog
index 3337228ba..d29808bc7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-11  Robert Millan  <rmh@aybabtu.com>
+
+	* kern/device.c (grub_device_open): Do not handle grub_disk_open()
+	errors.  Leave it to the upper layer to handle them.
+
 2008-08-09  Christian Franke  <franke@computer.org>
 
 	* Makefile.in: Add `target_os' and `enable_grub_pe2elf'.
diff --git a/kern/device.c b/kern/device.c
index 0b44f381a..60f25c192 100644
--- a/kern/device.c
+++ b/kern/device.c
@@ -49,11 +49,7 @@ grub_device_open (const char *name)
   /* Try to open a disk.  */
   disk = grub_disk_open (name);
   if (! disk)
-    {
-      grub_print_error ();
-      grub_errno = GRUB_ERR_NONE;
-      goto fail;
-    }
+    goto fail;
 
   dev->disk = disk;
   dev->net = 0;	/* FIXME */