From ae3717c8ef8245e5ac6d3ed850d04cfbe3c59434 Mon Sep 17 00:00:00 2001
From: Alan Stern <stern@rowland.harvard.edu>
Date: Mon, 31 Jan 2011 10:56:37 -0500
Subject: [PATCH] --- yaml --- r: 233117 b: refs/heads/master c:
 d199c96d41d80a567493e12b8e96ea056a1350c1 h: refs/heads/master i:   233115:
 9d4aa97238582a4df936c71fd59b3dfdf58ad9e9 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/usb/core/hub.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0cdb534528cf..348dd9c2f087 100644
--- 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
index 4310cc4b1cb5..d041c6826e43 100644
--- 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;
 	}