diff options
| author | Stefan Hajnoczi | 2017-05-15 15:29:53 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi | 2017-05-15 15:29:58 +0200 |
| commit | 8a813c9868218242f7d7b68f45ac4f484b1ccba9 (patch) | |
| tree | d1e6156547008843de8c474621cc24707048301f /hw/usb/dev-hub.c | |
| parent | Merge remote-tracking branch 'kraxel/tags/pull-ui-20170512-1' into staging (diff) | |
| parent | hw/usb/dev-serial: Do not try to set vendorid or productid properties (diff) | |
| download | qemu-8a813c9868218242f7d7b68f45ac4f484b1ccba9.tar.gz qemu-8a813c9868218242f7d7b68f45ac4f484b1ccba9.tar.xz qemu-8a813c9868218242f7d7b68f45ac4f484b1ccba9.zip | |
Merge remote-tracking branch 'kraxel/tags/pull-usb-20170512-1' into staging
usb: bugfixes, doc update
# gpg: Signature made Fri 12 May 2017 01:20:29 PM 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
* kraxel/tags/pull-usb-20170512-1:
hw/usb/dev-serial: Do not try to set vendorid or productid properties
xhci: relax link check
usb-hub: clear PORT_STAT_SUSPEND on wakeup
xhci: fix logging
usb-redir: fix stack overflow in usbredir_log_data
qemu-doc: Update to use the new way of attaching USB devices
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'hw/usb/dev-hub.c')
| -rw-r--r-- | hw/usb/dev-hub.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c index 9fe7333946..47b7519910 100644 --- a/hw/usb/dev-hub.c +++ b/hw/usb/dev-hub.c @@ -208,6 +208,7 @@ static void usb_hub_wakeup(USBPort *port1) USBHubPort *port = &s->ports[port1->index]; if (port->wPortStatus & PORT_STAT_SUSPEND) { + port->wPortStatus &= ~PORT_STAT_SUSPEND; port->wPortChange |= PORT_STAT_C_SUSPEND; usb_wakeup(s->intr, 0); } |