diff --git a/ChangeLog b/ChangeLog
index 5c2378dd7..d99396d93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-11  Pavel Roskin  <proski@gnu.org>
 
+	* disk/usbms.c (grub_usbms_transfer): Initialize `err' to fix
+	a compiler warning.
+
 	* loader/i386/bsd.c (grub_freebsd_boot): Rename `entry' to
 	`entry_lo' to fix variable shadowing.
 
diff --git a/disk/usbms.c b/disk/usbms.c
index 147891956..3c7ebaf94 100644
--- a/disk/usbms.c
+++ b/disk/usbms.c
@@ -221,7 +221,7 @@ grub_usbms_transfer (struct grub_scsi *scsi, grub_size_t cmdsize, char *cmd,
   grub_usbms_dev_t dev = (grub_usbms_dev_t) scsi->data;
   struct grub_usbms_csw status;
   static grub_uint32_t tag = 0;
-  grub_usb_err_t err;
+  grub_usb_err_t err = GRUB_USB_ERR_NONE;
   int retrycnt = 3;
 
  retry: