From e32d67c82ac2135fb8ca340afff072d0c98dedbc Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Tue, 11 Dec 2007 16:02:23 -0500 Subject: [PATCH] --- yaml --- r: 74937 b: refs/heads/master c: d48bd977e0dd8c17081d12242bfc09d743ea0d26 h: refs/heads/master i: 74935: 01467c0e03d34767eb8d9d9d3537195891f43a12 v: v3 --- [refs] | 2 +- trunk/drivers/usb/core/hub.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9b447c15e31a..06efedb49ea0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f88ed90d8627d0d3d93b330d6d2012c2934fb54e +refs/heads/master: d48bd977e0dd8c17081d12242bfc09d743ea0d26 diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c index 13b326a13377..b04d232d4c65 100644 --- a/trunk/drivers/usb/core/hub.c +++ b/trunk/drivers/usb/core/hub.c @@ -522,9 +522,9 @@ static void hub_quiesce(struct usb_hub *hub) /* (blocking) stop khubd and related activity */ usb_kill_urb(hub->urb); if (hub->has_indicators) - cancel_delayed_work(&hub->leds); - if (hub->has_indicators || hub->tt.hub) - flush_scheduled_work(); + cancel_delayed_work_sync(&hub->leds); + if (hub->tt.hub) + cancel_work_sync(&hub->tt.kevent); } static void hub_activate(struct usb_hub *hub)