From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 11 Jul 2013 12:52:46 +0000 (+0200)
Subject: 	* grub-core/bus/usb/usbhub.c: Fix recheck logic.
X-Git-Tag: grub-2.02-beta1~954
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efa8640adbc98e934c97438262e459abe82ec4bc;p=thirdparty%2Fgrub.git

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

diff --git a/ChangeLog b/ChangeLog
index f404fd7d5..21ff3848c 100644
--- 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 e3b7d4032..cec39702b 100644
--- 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]);