diff --git a/ChangeLog b/ChangeLog
index 6b63e0816..24db897ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-20  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* kern/partition.c (grub_partition_probe): Initialize PART to
+	NULL. Otherwise, when no partition map is registered, this returns
+	a garbage.
+
 2005-07-19  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* partmap/apple.c (apple_partition_map_iterate): Check if POS
diff --git a/kern/partition.c b/kern/partition.c
index fd314875b..a2af9b847 100644
--- a/kern/partition.c
+++ b/kern/partition.c
@@ -55,7 +55,7 @@ grub_partition_map_iterate (int (*hook) (const grub_partition_map_t partmap))
 grub_partition_t
 grub_partition_probe (struct grub_disk *disk, const char *str)
 {
-  grub_partition_t part;
+  grub_partition_t part = 0;
 
   auto int part_map_probe (const grub_partition_map_t partmap);