---

yaml --- r: 118100 b: refs/heads/master c: 61fbeba h: refs/heads/master v: v3
git-mirror · Oct 29, 2008 · 2666393 · 2666393
1 parent 720a58c
commit 2666393
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74511bb340059be5a3fceb032213c7f325344694
+refs/heads/master: 61fbeba11c553c489ba5284c0ed67067dc7b7c0f
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
@@ -659,6 +659,9 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
 			PREPARE_DELAYED_WORK(&hub->init_work, hub_init_func2);
 			schedule_delayed_work(&hub->init_work,
 					msecs_to_jiffies(delay));
+
+			/* Suppress autosuspend until init is done */
+			to_usb_interface(hub->intfdev)->pm_usage_cnt = 1;
 			return;		/* Continues at init2: below */
 		} else {
 			hub_power_on(hub, true);