diff --git a/ChangeLog b/ChangeLog
index 7e6320795..343ae35df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	* bus/usb/uhci.c (grub_uhci_transfer): Set a limit transaction time.
 	(grub_uhci_portstatus): Likewise.
 	(grub_uhci_portstatus): Add necessary delay.
+	* bus/usb/usbhub.c (grub_usb_hub_add_dev): Fix loop-break condition.
 
 2009-12-21  Carles Pina i Estany  <carles@pina.cat>
 
diff --git a/bus/usb/usbhub.c b/bus/usb/usbhub.c
index 6881ce000..a22ca60c2 100644
--- a/bus/usb/usbhub.c
+++ b/bus/usb/usbhub.c
@@ -48,7 +48,7 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed)
       if (! grub_usb_devs[i])
 	break;
     }
-  if (grub_usb_devs[i])
+  if (i == 128)
     {
       grub_error (GRUB_ERR_IO, "Can't assign address to USB device");
       return NULL;
@@ -60,6 +60,7 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller, grub_usb_speed_t speed)
 			 | GRUB_USB_REQTYPE_TARGET_DEV),
 			GRUB_USB_REQ_SET_ADDRESS,
 			i, 0, 0, NULL);
+
   dev->addr = i;
   dev->initialized = 1;
   grub_usb_devs[i] = dev;