---

yaml --- r: 233117 b: refs/heads/master c: d199c96 h: refs/heads/master i: 233115: 9d4aa97 v: v3
git-mirror · Feb 4, 2011 · ae3717c · ae3717c
1 parent 6ed0494
commit ae3717c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d86d52a33cfe6338efd007cfcca895b18c1d84b
+refs/heads/master: d199c96d41d80a567493e12b8e96ea056a1350c1
diff --git a/trunk/drivers/usb/core/hub.c b/trunk/drivers/usb/core/hub.c
@@ -2753,6 +2753,11 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1,
 		udev->ttport = hdev->ttport;
 	} else if (udev->speed != USB_SPEED_HIGH
 			&& hdev->speed == USB_SPEED_HIGH) {
+		if (!hub->tt.hub) {
+			dev_err(&udev->dev, "parent hub has no TT\n");
+			retval = -EINVAL;
+			goto fail;
+		}
 		udev->tt = &hub->tt;
 		udev->ttport = port1;
 	}