From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1as5St-0002kC-Rz for qemu-devel@nongnu.org; Mon, 18 Apr 2016 05:27:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1as5Sq-0007hs-J2 for qemu-devel@nongnu.org; Mon, 18 Apr 2016 05:27:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49782) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1as5Sq-0007g9-EX for qemu-devel@nongnu.org; Mon, 18 Apr 2016 05:27:28 -0400 From: Gerd Hoffmann Date: Mon, 18 Apr 2016 11:27:23 +0200 Message-Id: <1460971643-1499-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1460971643-1499-1-git-send-email-kraxel@redhat.com> References: <1460971643-1499-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] Revert "ehci: make idt processing more robust" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: P J P , dushaobo@360.cn, Gerd Hoffmann This reverts commit 156a2e4dbffa85997636a7a39ef12da6f1b40254. Breaks freebsd. --- 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 923f110..7add81c 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1397,7 +1397,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; @@ -1489,10 +1489,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; } -- 1.8.3.1