summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/usb.h
diff options
context:
space:
mode:
authorMathias Nyman <mathias.nyman@linux.intel.com>2015-12-10 09:59:25 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-24 20:16:52 -0800
commit8a1b2725a60d3267135c15e80984b4406054f650 (patch)
treecd8d8bfd21d736013c7ebbb3344dded1a32e9c52 /drivers/usb/core/usb.h
parent73a02d32458ecff5b6241e7e7bd6445f70400bad (diff)
downloadlinux-stable-8a1b2725a60d3267135c15e80984b4406054f650.tar.gz
linux-stable-8a1b2725a60d3267135c15e80984b4406054f650.tar.bz2
linux-stable-8a1b2725a60d3267135c15e80984b4406054f650.zip
usb: define USB_SPEED_SUPER_PLUS speed for SuperSpeedPlus USB3.1 devices
Add a new USB_SPEED_SUPER_PLUS device speed, and make sure usb core can handle the new speed. In most cases the behaviour is the same as with USB_SPEED_SUPER SuperSpeed devices. In a few places we add a "Plus" string to inform the user of the new speed. Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/usb.h')
-rw-r--r--drivers/usb/core/usb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/core/usb.h b/drivers/usb/core/usb.h
index 05b5e17abf92..53318126ed91 100644
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
@@ -45,7 +45,7 @@ static inline unsigned usb_get_max_power(struct usb_device *udev,
struct usb_host_config *c)
{
/* SuperSpeed power is in 8 mA units; others are in 2 mA units */
- unsigned mul = (udev->speed == USB_SPEED_SUPER ? 8 : 2);
+ unsigned mul = (udev->speed >= USB_SPEED_SUPER ? 8 : 2);
return c->desc.bMaxPower * mul;
}