diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 06:21:08 -0500 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /drivers/usb/core/hub.c | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/usb/core/hub.c')
| -rw-r--r-- | drivers/usb/core/hub.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 13b326a133..b04d232d4c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
| @@ -522,9 +522,9 @@ static void hub_quiesce(struct usb_hub *hub) | |||
| 522 | /* (blocking) stop khubd and related activity */ | 522 | /* (blocking) stop khubd and related activity */ |
| 523 | usb_kill_urb(hub->urb); | 523 | usb_kill_urb(hub->urb); |
| 524 | if (hub->has_indicators) | 524 | if (hub->has_indicators) |
| 525 | cancel_delayed_work(&hub->leds); | 525 | cancel_delayed_work_sync(&hub->leds); |
| 526 | if (hub->has_indicators || hub->tt.hub) | 526 | if (hub->tt.hub) |
| 527 | flush_scheduled_work(); | 527 | cancel_work_sync(&hub->tt.kevent); |
| 528 | } | 528 | } |
| 529 | 529 | ||
| 530 | static void hub_activate(struct usb_hub *hub) | 530 | static void hub_activate(struct usb_hub *hub) |