diff --git a/ChangeLog b/ChangeLog
index ae4a19108..db2c8855e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* disk/scsi.c (grub_scsi_iterate): Fix a memory leak.
+
 2010-03-04  Robert Millan  <rmh.grub@aybabtu.com>
 
 	Support relative image path in theme file.
diff --git a/disk/scsi.c b/disk/scsi.c
index 6f3233b29..eba237287 100644
--- a/disk/scsi.c
+++ b/disk/scsi.c
@@ -208,12 +208,14 @@ grub_scsi_iterate (int (*hook) (const char *name))
       for (i = 0; i < luns; i++)
 	{
 	  char *sname;
+	  int ret;
 	  sname = grub_xasprintf ("%s%c", name, 'a' + i);
 	  if (!sname)
 	    return 1;
-	  if (hook (sname))
-	    return 1;
+	  ret = hook (sname);
 	  grub_free (sname);
+	  if (ret)
+	    return 1;
 	}
       return 0;
     }