Commit 36aa8117 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1b26da15

drivers/usb/core/hub.c

+11 −4
Original line number Diff line number Diff line
@@ -713,11 +713,18 @@ static void hub_restart(struct usb_hub *hub, int type) 
		}



		/* 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 */

		if (status == 0 && !(portstatus & USB_PORT_STAT_CONNECTION))

			continue;

		case HUB_RESET:

		case HUB_RESUME:

			status = hub_port_status(hub, port1,

					&portstatus, &portchange);

			break;

		}



		/* For "USB_PERSIST"-enabled children we must

		 * mark the child device for reset-resume and