qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 2/5] usb-host: fix streams detection in usb_host_speed_compat
Date: Wed, 14 Sep 2016 11:33:32 +0200	[thread overview]
Message-ID: <1473845615-16982-3-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1473845615-16982-1-git-send-email-kraxel@redhat.com>

The companion descriptor is present on all usb3 devices, not only
those with streams support.  We need to check attributes to see
whenever the device uses streams or not.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 1473406890-30164-1-git-send-email-kraxel@redhat.com
---
 hw/usb/host-libusb.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index e94672c..bd81d71 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;
-- 
1.8.3.1

  parent reply	other threads:[~2016-09-14  9:33 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-14  9:33 [Qemu-devel] [PULL 0/5] usb: large file support for mtp, bugfixes Gerd Hoffmann
2016-09-14  9:33 ` [Qemu-devel] [PULL 1/5] xhci: Fix remainder field for TR_SETUP completion event Gerd Hoffmann
2016-09-14  9:33 ` Gerd Hoffmann [this message]
2016-09-14  9:33 ` [Qemu-devel] [PULL 3/5] usb:xhci:fix memory leak in usb_xhci_exit Gerd Hoffmann
2016-09-14  9:33 ` [Qemu-devel] [PULL 4/5] usb-mtp: fix sending files larger than 4gb Gerd Hoffmann
2016-09-14  9:33 ` [Qemu-devel] [PULL 5/5] usb-mtp: added object properties Gerd Hoffmann
2016-09-15 14:49 ` [Qemu-devel] [PULL 0/5] usb: large file support for mtp, bugfixes Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473845615-16982-3-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).