From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 29 Aug 2014 10:40:55 +0000 (+0200)
Subject: Revert "xhci: Fix number of streams allocated when using streams"
X-Git-Tag: qemu-xen-4.6.0-rc1~243^2~12
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f90e160b502fb5c464eb9417ac075a78f13e9801;p=qemu-upstream-unstable.git

Revert "xhci: Fix number of streams allocated when using streams"

This reverts commit d063c3112c4cd23a479ee18720c2bd119da2d315.

"2 << x" is the same as "2 ^ (x + 1)", so the old code is correct.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index f7f9fed73..88660e85b 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -1151,7 +1151,7 @@ static void xhci_reset_streams(XHCIEPContext *epctx)
 static void xhci_alloc_streams(XHCIEPContext *epctx, dma_addr_t base)
 {
     assert(epctx->pstreams == NULL);
-    epctx->nr_pstreams = 2 << (epctx->max_pstreams + 1);
+    epctx->nr_pstreams = 2 << epctx->max_pstreams;
     epctx->pstreams = xhci_alloc_stream_contexts(epctx->nr_pstreams, base);
 }