summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/core/hub.h2
-rw-r--r--include/linux/usb.h7
2 files changed, 7 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
index 0f8e82a4d48..1b05994de4d 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -229,7 +229,7 @@ struct usb_hub {
unsigned resume_root_hub:1;
unsigned has_indicators:1;
- enum hub_led_mode indicator[USB_MAXCHILDREN];
+ u8 indicator[USB_MAXCHILDREN];
struct work_struct leds;
};
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 5482bfb3303..e5cb1690975 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -313,8 +313,13 @@ struct usb_bus {
/* This is arbitrary.
* From USB 2.0 spec Table 11-13, offset 7, a hub can
* have up to 255 ports. The most yet reported is 10.
+ *
+ * Current Wireless USB host hardware (Intel i1480 for example) allows
+ * up to 22 devices to connect. Upcoming hardware might raise that
+ * limit. Because the arrays need to add a bit for hub status data, we
+ * do 31, so plus one evens out to four bytes.
*/
-#define USB_MAXCHILDREN (16)
+#define USB_MAXCHILDREN (31)
struct usb_tt;