diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-15 14:56:36 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-15 14:56:36 +0100 |
| commit | 9f16390cd3cdd85fa20739f07120f4d697c11837 (patch) | |
| tree | cdd3d6a8592f3ff6cce507caed8b138ad97bb735 /hw/usb/host-libusb.c | |
| parent | d1eb8f2acba579830cf3798c3c15ce51be852c56 (diff) | |
| parent | 67f3ef0c7a149a4e92b877375f771e065ae58651 (diff) | |
| download | focaccia-qemu-9f16390cd3cdd85fa20739f07120f4d697c11837.tar.gz focaccia-qemu-9f16390cd3cdd85fa20739f07120f4d697c11837.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160914-1' into staging
usb-mtp: add support for files larger than 4g (gsoc) xhci & usb-host: bugfixes. # gpg: Signature made Wed 14 Sep 2016 10:30:38 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # 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>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/pull-usb-20160914-1: usb-mtp: added object properties usb-mtp: fix sending files larger than 4gb usb:xhci:fix memory leak in usb_xhci_exit usb-host: fix streams detection in usb_host_speed_compat xhci: Fix remainder field for TR_SETUP completion event. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/host-libusb.c')
| -rw-r--r-- | hw/usb/host-libusb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index e94672c155..bd81d71a98 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -743,10 +743,13 @@ static void usb_host_speed_compat(USBHostDevice *s) rc = libusb_get_ss_endpoint_companion_descriptor (ctx, endp, &endp_ss_comp); if (rc == LIBUSB_SUCCESS) { + int streams = endp_ss_comp->bmAttributes & 0x1f; + if (streams) { + compat_full = false; + compat_high = false; + } libusb_free_ss_endpoint_companion_descriptor (endp_ss_comp); - compat_full = false; - compat_high = false; } #endif break; |