1 files changed, 5 insertions, 6 deletions

diff --git a/include/linux/usb.h b/include/linux/usb.h
index 6a9a0c28415d..eba1f10e8cfd 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -374,13 +374,12 @@ struct usb_bus {
 
         int devnum_next;                /* Next open device number in
                                          * round-robin allocation */
+        struct mutex devnum_next_mutex; /* devnum_next mutex */
 
         struct usb_devmap devmap;       /* device address allocation map */
         struct usb_device *root_hub;    /* Root hub */
         struct usb_bus *hs_companion;   /* Companion EHCI bus, if any */
 
-        struct mutex usb_address0_mutex; /* unaddressed device mutex */
-
         int bandwidth_allocated;        /* on this bus: how much of the time
                                          * reserved for periodic (intr/iso)
                                          * requests is used, on average?
@@ -720,7 +719,7 @@ extern void usb_enable_ltm(struct usb_device *udev);
 
 static inline bool usb_device_supports_ltm(struct usb_device *udev)
 {
-        if (udev->speed != USB_SPEED_SUPER || !udev->bos || !udev->bos->ss_cap)
+        if (udev->speed < USB_SPEED_SUPER || !udev->bos || !udev->bos->ss_cap)
                 return false;
         return udev->bos->ss_cap->bmAttributes & USB_LTM_SUPPORT;
 }
@@ -1069,7 +1068,7 @@ struct usbdrv_wrap {
  *      for interfaces bound to this driver.
  * @soft_unbind: if set to 1, the USB core will not kill URBs and disable
  *      endpoints before calling the driver's disconnect method.
- * @disable_hub_initiated_lpm: if set to 0, the USB core will not allow hubs
+ * @disable_hub_initiated_lpm: if set to 1, the USB core will not allow hubs
  *      to initiate lower power link state transitions when an idle timeout
  *      occurs.  Device-initiated USB 3.0 link PM will still be allowed.
  *
@@ -1569,7 +1568,7 @@ static inline void usb_fill_bulk_urb(struct urb *urb,
  * Initializes a interrupt urb with the proper information needed to submit
  * it to a device.
  *
- * Note that High Speed and SuperSpeed interrupt endpoints use a logarithmic
+ * Note that High Speed and SuperSpeed(+) interrupt endpoints use a logarithmic
  * encoding of the endpoint interval, and express polling intervals in
  * microframes (eight per millisecond) rather than in frames (one per
  * millisecond).
@@ -1595,7 +1594,7 @@ static inline void usb_fill_int_urb(struct urb *urb,
         urb->complete = complete_fn;
         urb->context = context;
 
-        if (dev->speed == USB_SPEED_HIGH || dev->speed == USB_SPEED_SUPER) {
+        if (dev->speed == USB_SPEED_HIGH || dev->speed >= USB_SPEED_SUPER) {
                 /* make sure interval is within allowed range */
                 interval = clamp(interval, 1, 16);