diff --git a/ChangeLog b/ChangeLog
index b145d0c7d..e87ddefe3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/device.c (grub_device_iterate): Ignore errors during first scan.
+	Fixes amarsh bug.
+
 2009-12-09  Bruce Dubbs  <bruce.dubbs@gmail.com>
 
 	Remove miscellaneous files in distclean target.
diff --git a/kern/device.c b/kern/device.c
index 83ae3dcc8..9f219949b 100644
--- a/kern/device.c
+++ b/kern/device.c
@@ -109,6 +109,8 @@ grub_device_iterate (int (*hook) (const char *name))
 	  (void) grub_partition_iterate (dev->disk, iterate_partition);
 	  grub_device_close (dev);
 
+	  grub_errno = GRUB_ERR_NONE;
+
 	  p = ents;
 	  while (p != NULL)
 	    {