* 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.

diff --git a/ChangeLog b/ChangeLog
index b4438a7be1848dfb8ea97b8e25c1aa41946bf4d5..8514ef49b83c87eef76d79c2f7a5694913c3dcf0 100644 (file)
--- 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 2a5cc3be9bec18285d3db8f9785efa87a39221a3..f08910d2b3fac9b2e1338e14d320e83f1448692e 100644 (file)
--- 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;