diff --git a/ChangeLog b/ChangeLog
index b4438a7be..8514ef49b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
+
+	* grub-core/bus/usb/usbhub.c (poll_nonroot_hub): Change type of
+	`err' to grub_usb_err_t.
+	Reported and tested by: KESHAV P.R.
+
 2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
 
 	* grub-core/disk/efi/efidisk.c (grub_efidisk_get_device_name): Make
diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
index 2a5cc3be9..f08910d2b 100644
--- a/grub-core/bus/usb/usbhub.c
+++ b/grub-core/bus/usb/usbhub.c
@@ -309,7 +309,7 @@ detach_device (grub_usb_device_t dev)
 static void
 poll_nonroot_hub (grub_usb_device_t dev)
 {
-  grub_err_t err;
+  grub_usb_err_t err;
   unsigned i;
   grub_uint8_t changed;
   grub_size_t actual;