From 6bd8983bc35c39c0fd0f22d200aa7970d86026bc Mon Sep 17 00:00:00 2001
From: David Brownell <david-b@pacbell.net>
Date: Tue, 13 Sep 2005 19:57:36 -0700
Subject: [PATCH] --- yaml --- r: 10759 b: refs/heads/master c:
 dbc3887e7df4be78b33a83b97fde5d5f9a389859 h: refs/heads/master i:   10757:
 3d130469b4cb102feb77653264fc1e3cc85272d4   10755:
 0d7ee60d444a79bcbb15164a9738c54f38285d53   10751:
 f249adead9eb16ac585881c40b2b15c710b5ccdf v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/usb/core/hub.c | 33 +++++----------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/[refs] b/[refs]
index d20c340c9bfa..815391c19bf9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 390a8c345e6415cbf811232feedac70b56c9fc8d
+refs/heads/master: dbc3887e7df4be78b33a83b97fde5d5f9a389859
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
index 33127b828d60..b2ae9b6ca4db 100644
--- a/trunk/drivers/usb/core/hub.c
+++ b/trunk/drivers/usb/core/hub.c
@@ -1723,6 +1723,7 @@ static int finish_port_resume(struct usb_device *udev)
 			status);
 	else if (udev->actconfig) {
 		unsigned	i;
+		int		(*resume)(struct device *);
 
 		le16_to_cpus(&devstatus);
 		if (devstatus & (1 << USB_DEVICE_REMOTE_WAKEUP)) {
@@ -1741,35 +1742,11 @@ static int finish_port_resume(struct usb_device *udev)
 		}
 
 		/* resume interface drivers; if this is a hub, it
-		 * resumes the child devices
+		 * may have a child resume event to deal with soon
 		 */
-		for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) {
-			struct usb_interface	*intf;
-			struct usb_driver	*driver;
-
-			intf = udev->actconfig->interface[i];
-			if (is_active(intf))
-				continue;
-			if (!intf->dev.driver) {
-				/* FIXME maybe force to alt 0 */
-				continue;
-			}
-			driver = to_usb_driver(intf->dev.driver);
-
-			/* bus_rescan_devices() may rebind drivers */
-			if (!driver->resume)
-				continue;
-
-			/* can we do better than just logging errors? */
-			mark_active(intf);
-			status = driver->resume(intf);
-			if (status < 0) {
-				mark_quiesced(intf);
-				dev_dbg(&intf->dev,
-					"resume error %d\n",
-					status);
-			}
-		}
+		resume = udev->dev.bus->resume;
+		for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++)
+			(void) resume(&udev->actconfig->interface[i]->dev);
 		status = 0;
 
 	} else if (udev->devnum <= 0) {