* grub-core/bus/usb/usbhub.c: Fix recheck logic.

diff --git a/ChangeLog b/ChangeLog
index f404fd7d553893581d1dd0e90a0dfa9f9e6fb865..21ff3848c89ed3d75c1f2ea5c14a1bbcad74d75f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/bus/usb/usbhub.c: Fix recheck logic.
+
 2013-07-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkfont.c (write_font_ascii_bitmap): Fix handling of glyphs

diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
index e3b7d4032bd9d6a0b69ac6d793886cdbbd44cf3c..cec39702b6706a3c64155ab80d56d2cafbe3db75 100644 (file)
--- a/grub-core/bus/usb/usbhub.c
+++ b/grub-core/bus/usb/usbhub.c
@@ -688,10 +688,12 @@ grub_usb_poll_devices (int wait_for_completion)
                    * addressed properly, timeout happened */
                  hub->controller->dev->pending_reset = 0;
                  npending--;
-                 speed = hub->controller->dev->detect_dev (hub->controller,
-                                                            i, &changed);
                 }
             }
+          if (!hub->controller->dev->pending_reset)
+           speed = hub->controller->dev->detect_dev (hub->controller,
+                                                     i, &changed);
+
          if (changed)
            {
              detach_device (hub->devices[i]);