diff options
author | Felipe Balbi <felipe.balbi@nokia.com> | 2008-06-12 03:49:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 18:16:26 -0400 |
commit | 38f3ad5e7463d4dd490a8081a5f3f9f2dec7ecd6 (patch) | |
tree | 2dd60da46d065e4df9e34fe031d13e38bfc22dff /drivers/usb/core/hub.c | |
parent | 6deb270b5c60680ca9117bd545302ea6a58bad42 (diff) |
usb: hub: add check for unsupported bus topology
We can't allow hubs on the 7th tier as they would allow
devices on the 8th tier.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/hub.c')
-rw-r--r-- | drivers/usb/core/hub.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index e678ed8bd8c2..3251120b414e 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c | |||
@@ -1051,6 +1051,12 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
1051 | desc = intf->cur_altsetting; | 1051 | desc = intf->cur_altsetting; |
1052 | hdev = interface_to_usbdev(intf); | 1052 | hdev = interface_to_usbdev(intf); |
1053 | 1053 | ||
1054 | if (hdev->level == MAX_TOPO_LEVEL) { | ||
1055 | dev_err(&intf->dev, "Unsupported bus topology: " | ||
1056 | "hub nested too deep\n"); | ||
1057 | return -E2BIG; | ||
1058 | } | ||
1059 | |||
1054 | #ifdef CONFIG_USB_OTG_BLACKLIST_HUB | 1060 | #ifdef CONFIG_USB_OTG_BLACKLIST_HUB |
1055 | if (hdev->parent) { | 1061 | if (hdev->parent) { |
1056 | dev_warn(&intf->dev, "ignoring external hub\n"); | 1062 | dev_warn(&intf->dev, "ignoring external hub\n"); |