diff options
| author | Peter Maydell | 2015-05-11 14:54:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-05-11 14:54:00 +0200 |
| commit | 9ad2c8cd41a086020e21aa6d616b73bd5e2a800b (patch) | |
| tree | 9e53cd27d30f066fb6bebcf0b9cfac5f1347efb1 /hw/usb | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | docs: update BLOCK_IMAGE_CORRUPTED documentation (diff) | |
| download | qemu-9ad2c8cd41a086020e21aa6d616b73bd5e2a800b.tar.gz qemu-9ad2c8cd41a086020e21aa6d616b73bd5e2a800b.tar.xz qemu-9ad2c8cd41a086020e21aa6d616b73bd5e2a800b.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-05-09' into staging
trivial patches for 2015-05-09
# gpg: Signature made Fri May 8 22:58:42 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-05-09:
docs: update BLOCK_IMAGE_CORRUPTED documentation
glib-compat.h: change assert to g_assert
Remove various unused functions
sheepdog: fix resource leak with sd_snapshot_create
xhci: remove unused code
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/hcd-xhci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 927dc3652f..90a5fbff29 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -2203,7 +2203,6 @@ static void xhci_kick_ep(XHCIState *xhci, unsigned int slotid, if (epid == 1) { if (xhci_fire_ctl_transfer(xhci, xfer) >= 0) { epctx->next_xfer = (epctx->next_xfer + 1) % TD_QUEUE; - ep = xfer->packet.ep; } else { DPRINTF("xhci: error firing CTL transfer\n"); } |