---

yaml --- r: 98658 b: refs/heads/master c: 1236edf h: refs/heads/master v: v3
git-mirror · Jul 4, 2008 · e8f8615 · e8f8615
1 parent 0fc81f0
commit e8f8615
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de85422b94ddb23c021126815ea49414047c13dc
+refs/heads/master: 1236edf1c70107a0d31b3fba0b2a8783615d0d24
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
@@ -713,18 +713,11 @@ static void hub_restart(struct usb_hub *hub, int type)
 		}
 
 		/* Was the power session lost while we were suspended? */
-		switch (type) {
-		case HUB_RESET_RESUME:
-			portstatus = 0;
-			portchange = USB_PORT_STAT_C_CONNECTION;
-			break;
+		status = hub_port_status(hub, port1, &portstatus, &portchange);
 
-		case HUB_RESET:
-		case HUB_RESUME:
-			status = hub_port_status(hub, port1,
-					&portstatus, &portchange);
-			break;
-		}
+		/* If the device is gone, khubd will handle it later */
+		if (status == 0 && !(portstatus & USB_PORT_STAT_CONNECTION))
+			continue;
 
 		/* For "USB_PERSIST"-enabled children we must
 		 * mark the child device for reset-resume and