]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
USB: prevent autosuspend during hub initialization
authorAlan Stern <stern@rowland.harvard.edu>
Mon, 27 Oct 2008 16:07:44 +0000 (12:07 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 29 Oct 2008 21:54:41 +0000 (14:54 -0700)
This patch (as1153) fixes a potential problem in hub initialization.
Starting in 2.6.28, initialization was split into several tasks to
help speed up booting.  This opens the possibility that the hub may be
autosuspended before all the initialization tasks can complete.

Normally that wouldn't matter, but with incomplete initialization
there is a risk that the hub would never autoresume -- especially if
devices were plugged into the hub beforehand.  The solution is a
simple one-line change to suppress autosuspend until the
initialization is finished.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/core/hub.c

index 37ff8aed256d96634aae725ca667e6fcabfde9dc..b19cbfcd51da1bd53b500fd4ab3320c3108d8073 100644 (file)
@@ -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);