From 55e5fdfa541ec7bf1b1613624ed4dd8cdacaa841 Mon Sep 17 00:00:00 2001 From: Mark Lord Date: Mon, 14 May 2007 19:48:02 -0400 Subject: USB: hub.c loops forever on resume from ram due to bluetooth Okay, found it. The root cause here was a missing CONFIG_USB_SUSPEND=y, which means the hci_usb device never got marked as USB_STATE_SUSPENDED, which then caused the loop to go on forever. The system works fine now with CONFIG_USB_SUSPEND=y in the .config. Here's the patch to prevent future lockups for this or other causes. I no longer need it, but it does still seem a good idea. Signed-off-by: Mark Lord Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/hub.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index f4ef7c25096e..08f0c22fa917 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -403,9 +403,10 @@ static void hub_tt_kevent (struct work_struct *work) struct usb_hub *hub = container_of(work, struct usb_hub, tt.kevent); unsigned long flags; + int limit = 100; spin_lock_irqsave (&hub->tt.lock, flags); - while (!list_empty (&hub->tt.clear_list)) { + while (--limit && !list_empty (&hub->tt.clear_list)) { struct list_head *temp; struct usb_tt_clear *clear; struct usb_device *hdev = hub->hdev; -- cgit v1.2.3