projects
/
users
/
dwmw2
/
qemu.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
706bab6
)
Revert "ehci: make idt processing more robust"
author
Gerd Hoffmann <kraxel@redhat.com>
Mon, 18 Apr 2016 07:20:54 +0000
(09:20 +0200)
committer
Michael Roth <mdroth@linux.vnet.ibm.com>
Mon, 9 May 2016 03:37:18 +0000
(22:37 -0500)
This reverts commit
156a2e4dbffa85997636a7a39ef12da6f1b40254
.
Breaks FreeBSD.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
(cherry picked from commit
a49923d2837d20510d645d3758f1ad87c32d0730
)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/usb/hcd-ehci.c
patch
|
blob
|
history
diff --git
a/hw/usb/hcd-ehci.c
b/hw/usb/hcd-ehci.c
index f32347303a3df3df6f24406f38776a94402bbd2f..4120bb7c3a11d7e77e30a441df8d6b367abcc02b 100644
(file)
--- a/
hw/usb/hcd-ehci.c
+++ b/
hw/usb/hcd-ehci.c
@@
-1390,7
+1390,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;
@@
-1482,10
+1482,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
;
}