summary refs log tree commit diff stats
path: root/hw/usb/host-libusb.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-11-03 14:09:59 +0000
committerPeter Maydell <peter.maydell@linaro.org>2015-11-03 14:09:59 +0000
commit19bb5467135df4b234af2c93bf6c50284158d6ca (patch)
treee154fe0f6c626476879a75ae3e109b02efc9663e /hw/usb/host-libusb.c
parent130d0bc6594d0cc6591d00312841891b3c187b07 (diff)
parenta9be4e7c48c4892c836bda1be4d550bb1a6732bd (diff)
downloadfocaccia-qemu-19bb5467135df4b234af2c93bf6c50284158d6ca.tar.gz
focaccia-qemu-19bb5467135df4b234af2c93bf6c50284158d6ca.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20151103-1' into staging
usb: two bugfixes for ehci & usb-host.

# gpg: Signature made Tue 03 Nov 2015 10:57:28 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-usb-20151103-1:
  usb-host: fix usb3ep0quirk test
  ehci: clear suspend bit on detach

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/host-libusb.c')
-rw-r--r--hw/usb/host-libusb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 7695a97143..3f8e540bd2 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -1240,7 +1240,7 @@ static void usb_host_handle_control(USBDevice *udev, USBPacket *p,
 
     /* Fix up USB-3 ep0 maxpacket size to allow superspeed connected devices
      * to work redirected to a not superspeed capable hcd */
-    if (udev->speed == USB_SPEED_SUPER &&
+    if ((udev->speedmask & USB_SPEED_MASK_SUPER) &&
         !(udev->port->speedmask & USB_SPEED_MASK_SUPER) &&
         request == 0x8006 && value == 0x100 && index == 0) {
         r->usb3ep0quirk = true;