提交 36aa8117 编写于 作者: G Greg Kroah-Hartman

USB: revert "don't lose disconnections during suspend"

This reverts Alan's previous patch so that the recent Hub changes will
apply cleanly.  The above mentioned patch was needed for 2.6.26 to work
properly.

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Lukas Hejtmanek <xhejtman@ics.muni.cz>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 1b26da15
...@@ -713,11 +713,18 @@ static void hub_restart(struct usb_hub *hub, int type) ...@@ -713,11 +713,18 @@ static void hub_restart(struct usb_hub *hub, int type)
} }
/* Was the power session lost while we were suspended? */ /* Was the power session lost while we were suspended? */
status = hub_port_status(hub, port1, &portstatus, &portchange); switch (type) {
case HUB_RESET_RESUME:
portstatus = 0;
portchange = USB_PORT_STAT_C_CONNECTION;
break;
/* If the device is gone, khubd will handle it later */ case HUB_RESET:
if (status == 0 && !(portstatus & USB_PORT_STAT_CONNECTION)) case HUB_RESUME:
continue; status = hub_port_status(hub, port1,
&portstatus, &portchange);
break;
}
/* For "USB_PERSIST"-enabled children we must /* For "USB_PERSIST"-enabled children we must
* mark the child device for reset-resume and * mark the child device for reset-resume and
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册