From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 31 Mar 2010 20:03:48 +0000 (+0200)
Subject: 	* kern/device.c (grub_device_iterate): Clear errors after failed
X-Git-Tag: 1.99~992
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=495442ed025eb218077a5d86777894ffefe46c48;p=thirdparty%2Fgrub.git

	* kern/device.c (grub_device_iterate): Clear errors after failed
	opening device.
---

diff --git a/ChangeLog b/ChangeLog
index d05dd5a7d..d35e1ca22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-31  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/device.c (grub_device_iterate): Clear errors after failed
+	opening device.
+
 2010-03-31  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if
diff --git a/kern/device.c b/kern/device.c
index cd019fdaf..4273fedfe 100644
--- a/kern/device.c
+++ b/kern/device.c
@@ -98,7 +98,10 @@ grub_device_iterate (int (*hook) (const char *name))
 
       dev = grub_device_open (disk_name);
       if (! dev)
-	return 0;
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  return 0;
+	}
 
       if (dev->disk && dev->disk->has_partitions)
 	{