40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
Date: Mon, 18 Apr 2016 09:20:54 +0200
|
|
Subject: [PATCH] Revert "ehci: make idt processing more robust"
|
|
|
|
This reverts commit 156a2e4dbffa85997636a7a39ef12da6f1b40254.
|
|
|
|
Breaks FreeBSD.
|
|
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
(cherry picked from commit a49923d2837d20510d645d3758f1ad87c32d0730)
|
|
---
|
|
hw/usb/hcd-ehci.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
|
|
index 8dbfbe3..ba5baf9 100644
|
|
--- a/hw/usb/hcd-ehci.c
|
|
+++ b/hw/usb/hcd-ehci.c
|
|
@@ -1389,7 +1389,7 @@ static int ehci_process_itd(EHCIState *ehci,
|
|
{
|
|
USBDevice *dev;
|
|
USBEndpoint *ep;
|
|
- uint32_t i, len, pid, dir, devaddr, endp, xfers = 0;
|
|
+ uint32_t i, len, pid, dir, devaddr, endp;
|
|
uint32_t pg, off, ptr1, ptr2, max, mult;
|
|
|
|
ehci->periodic_sched_active = PERIODIC_ACTIVE;
|
|
@@ -1481,10 +1481,9 @@ static int ehci_process_itd(EHCIState *ehci,
|
|
ehci_raise_irq(ehci, USBSTS_INT);
|
|
}
|
|
itd->transact[i] &= ~ITD_XACT_ACTIVE;
|
|
- xfers++;
|
|
}
|
|
}
|
|
- return xfers ? 0 : -1;
|
|
+ return 0;
|
|
}
|
|
|
|
|