diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-07-17 12:39:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-07-17 12:39:12 +0100 |
| commit | 5b5e8cdd7da7a2214dd062afff5b866234aab228 (patch) | |
| tree | d57dbd4c9cdb7261aeea7db0a9103160a2e384c8 /hw/usb/host-libusb.c | |
| parent | fd1a9ef9c2493b5bc98e8e041333a57b635c5d71 (diff) | |
| parent | 92fdfa4bef9c92addcc009dd3e0131172b4fdc78 (diff) | |
| download | focaccia-qemu-5b5e8cdd7da7a2214dd062afff5b866234aab228.tar.gz focaccia-qemu-5b5e8cdd7da7a2214dd062afff5b866234aab228.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20150717-1' into staging
usb: fixes for 2.4 (ccid, xhci and usb-host) # gpg: Signature made Fri Jul 17 12:21:42 2015 BST 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-20150717-1: Revert "xhci: set timer to retry xfers" usb-ccid: add missing wakeup calls usb-ccid: fix 61b4887b41b270bc837ead57bc502d904af023bb Re-attach usb device to kernel while usb_host_open fails 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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index bc2944c6b2..11429f5e73 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -889,6 +889,9 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev) fail: trace_usb_host_open_failure(bus_num, addr); if (s->dh != NULL) { + usb_host_release_interfaces(s); + libusb_reset_device(s->dh); + usb_host_attach_kernel(s); libusb_close(s->dh); s->dh = NULL; s->dev = NULL; |