* grub-core/kern/device.c (grub_device_open): Remove dead code.

diff --git a/ChangeLog b/ChangeLog
index 61a58d13c4a3aabf86dbbf4388294e9b8395bb6d..82e65738232ae7bb862f3c44dd4a40b145fe9595 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/device.c (grub_device_open): Remove dead code.
+
 2012-06-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * include/grub/elf.h: Rename R_PPC to GRUB_R_PPC to avoid collisions.

diff --git a/grub-core/kern/device.c b/grub-core/kern/device.c
index 7ba09b03f6d16e650a748fdcd52bd3e73978d492..12615647d0b9393ed1d2c961d0adbe024be84273 100644 (file)
--- a/grub-core/kern/device.c
+++ b/grub-core/kern/device.c
@@ -32,7 +32,6 @@ grub_net_t (*grub_net_open) (const char *name) = NULL;
 grub_device_t
 grub_device_open (const char *name)
 {
-  grub_disk_t disk = 0;
   grub_device_t dev = 0;
 
   if (! name)
@@ -64,9 +63,6 @@ grub_device_open (const char *name)
     return dev;
 
  fail:
-  if (disk)
-    grub_disk_close (disk);
-
   grub_free (dev);
 
   return 0;