From efa8640adbc98e934c97438262e459abe82ec4bc Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Thu, 11 Jul 2013 14:52:46 +0200 Subject: [PATCH] * grub-core/bus/usb/usbhub.c: Fix recheck logic. --- ChangeLog | 4 ++++ grub-core/bus/usb/usbhub.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f404fd7d5..21ff3848c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-07-11 Vladimir Serbinenko + + * grub-core/bus/usb/usbhub.c: Fix recheck logic. + 2013-07-11 Vladimir Serbinenko * 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]);