diff options
| author | Peter Maydell | 2018-12-16 13:05:08 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-12-16 13:05:08 +0100 |
| commit | 3866e6bebd0cd498e684f1d3ab10b64c853d186f (patch) | |
| tree | 869a8176bc781baafc316ec0c6e16362b324f88e /hw/usb/host-libusb.c | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-12-13-v2' in... (diff) | |
| parent | usb-mtp: Limit filename to object information size (diff) | |
| download | qemu-3866e6bebd0cd498e684f1d3ab10b64c853d186f.tar.gz qemu-3866e6bebd0cd498e684f1d3ab10b64c853d186f.tar.xz qemu-3866e6bebd0cd498e684f1d3ab10b64c853d186f.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20181214-pull-request' into staging
usb: fixes for mtp, ehci, usb-host and pvusb (xen).
# gpg: Signature made Fri 14 Dec 2018 10:38:33 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# 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/usb-20181214-pull-request:
usb-mtp: Limit filename to object information size
usb-mtp: use O_NOFOLLOW and O_CLOEXEC.
ehci: fix fetch qtd race
usb-host: reset and close libusb_device_handle before qemu exit
pvusb: set max grants only in initialise
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index b6602ded4e..833250a886 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -988,7 +988,9 @@ static void usb_host_exit_notifier(struct Notifier *n, void *data) if (s->dh) { usb_host_release_interfaces(s); + libusb_reset_device(s->dh); usb_host_attach_kernel(s); + libusb_close(s->dh); } } |